sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code
78,534 Commits 60 Branches 1,144 Tags 452 MiB
a1901b55cf
Commit Graph

78534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ira Cooper
a1901b55cf Fix bug #8729 - getpass regressions on Solaris/Illumos - 3.6 and master. 
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Tue Jan 31 23:28:09 CET 2012 on sn-devel-104
 2012-01-31 23:28:09 +01:00
Stefan Metzmacher
6b8a4c96e8 s3:client: ignore SMBecho errors (the server may not support it) (bug #8139) 
metze
 2012-01-31 21:53:25 +01:00
Stefan Metzmacher
27c686dd70 Revert "Fix bug #8139 - smbclient fails if server does not support Echo request." 
This reverts commit 1fdc96ecaf.

This is wrong in master as the error codes are different compared to
3.5.x. The correct way to handle this is to call cli_state_is_connected().

metze
 2012-01-31 21:53:25 +01:00
Stefan Metzmacher
507872f90f s3:smbd: inline code in reply_sesssetup_and_X_spnego() 
This makes the logic much easier to follow.

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue Jan 31 21:52:45 CET 2012 on sn-devel-104
 2012-01-31 21:52:45 +01:00
Stefan Metzmacher
5f79ad5f87 s3:smbd: the spnego session setup don't need to copy the in blob 
metze
 2012-01-31 20:17:10 +01:00
Stefan Metzmacher
ec0142dd31 s3:smbd: rework reply_spnego_ntlmssp to reply_spnego_generic 
This removes the unused spnego_gen_auth_response() wrapping.

metze
 2012-01-31 20:17:10 +01:00
Stefan Metzmacher
ee15790d7a s3:smbd: remove unused code from sesssetup.c 
metze
 2012-01-31 20:17:10 +01:00
Stefan Metzmacher
63f6567ca9 s3:smbd: remove pending_auth_data logic 
This is handled by the gensec_spnego module.

metze
 2012-01-31 20:17:10 +01:00
Stefan Metzmacher
8327ee94db s3:smbd: always use the gensec code path in sesssetup.c 
The other code pathes are unused, because we always have
the spnego gensec module.

metze
 2012-01-31 20:17:10 +01:00
Stefan Metzmacher
3383ebbe7e s3:smbd: rework smbd_smb2_*_ntlmssp_auth* to smbd_smb2_auth_generic* 
metze
 2012-01-31 20:17:10 +01:00
Stefan Metzmacher
58e401fae2 s3:smbd: always use the gensec code path in smb2_sesssetup.c 
The other code pathes are unused, because we always have
the spnego gensec module.

metze
 2012-01-31 20:17:10 +01:00
Andrew Bartlett
5ad7665b63 libcli/smb: Convert struct smb_trans_enc_state to talloc 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
 2012-01-31 20:17:10 +01:00
Andrew Bartlett
fce53e0e79 s3-libsmb: Remove unused enum smb_trans_enc_type 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
 2012-01-31 20:17:10 +01:00
Andrew Bartlett
a1a667dd37 s3-libsmb: Use gensec_spnego in smb seal client 
This is intead of the inline, manual spnego code currently
in use.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
 2012-01-31 20:17:10 +01:00
Andrew Bartlett
d6b0d521ea s3-smbd: Use gensec_spnego in smb seal server 
This is instead of the inline, manual spnego code currently
in use.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
 2012-01-31 20:17:09 +01:00
Stefan Metzmacher
204dfd2c1d s3:libsmb/auth_generic: make use of gensec_spnego in the client 
metze
 2012-01-31 20:17:09 +01:00
Stefan Metzmacher
ab364e9874 s3:auth/auth_generic: make use of gensec_spnego in the server 
metze
 2012-01-31 20:17:09 +01:00
Volker Lendecke
2b1d7ac060 s3: Unify stream testing in open_directory 
The second if-statement could never have kicked in, assuming the
SMB_ASSERT above was right.

Jeremy, please check!

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Tue Jan 31 20:15:36 CET 2012 on sn-devel-104
 2012-01-31 20:15:36 +01:00
Volker Lendecke
549a31963e s3: Re-indent an && sequence for better understanding 2012-01-31 18:38:15 +01:00
Volker Lendecke
312228d0c8 s3: Fix "smbcontrol smbd close-share" 2012-01-31 18:38:15 +01:00
Michael Adam
8972c92342 s3:net ads join: remove a useless empty comment block 
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Tue Jan 31 18:37:45 CET 2012 on sn-devel-104
 2012-01-31 18:37:45 +01:00
Michael Adam
976672bf80 s3:net ads join: add a comment for the call to _net_ads_join_dns_update() 2012-01-31 17:00:30 +01:00
Michael Adam
be312e76d2 s3:net ads join: reduce indentation in _net_ads_join_dns_updates() 2012-01-31 17:00:30 +01:00
Michael Adam
7e5c5bdcc4 s3:net ads join: move dns update code out to new function _net_ads_join_dns_updates() 2012-01-31 17:00:30 +01:00
Michael Adam
1768d3621a s3:net ads join: improve comment for dns update block 2012-01-31 17:00:30 +01:00
Michael Adam
8f9b43281d s3:net ads join: improve status evaluation for call to net_update_dns() 
untangle assignment from check and log error code in message if failed.
 2012-01-31 17:00:30 +01:00
Michael Adam
9cd7b8f04d s3:net ads join: interpret return code of ads_kinit_password() in dns update block 
If failed, print according error message and skip the attempt to do dns update.
 2012-01-31 17:00:30 +01:00
Michael Adam
4831b6e6bb s3:net ads join: check for malloc success and react accordingly in dns update block 2012-01-31 17:00:30 +01:00
Michael Adam
ca913c98a6 s3:net ads join: check for success of fetching machine password in dns update block 
log and cleanup accordingly if failed
 2012-01-31 17:00:30 +01:00
Michael Adam
04fa9a389c s3:net ads join: untangle assignment from check, fix return code and improve error logging 
only the dns update failed, not the join.
Also do proper memory cleanup
 2012-01-31 17:00:30 +01:00
Michael Adam
63d9b5d75a s3:net ads join: reduce indentation and improve logging in the dns update code block 
by doing an early goto done upon error condition
 2012-01-31 17:00:30 +01:00
Michael Adam
1d83f2118e s3:net ads join: untangle assignment from check. 2012-01-31 17:00:30 +01:00
Michael Adam
dc4cf82fb5 s3:net registry: fix a copy and paste error in a help text 2012-01-31 17:00:30 +01:00
Amitay Isaacs
2343703985 tevent: Fix python documentation strings 
Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Tue Jan 31 16:59:29 CET 2012 on sn-devel-104
 2012-01-31 16:59:29 +01:00
Jelmer Vernooij
c83ce7bcc6 replace: Only include C files from which there are actually functions used. 
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Tue Jan 31 15:21:04 CET 2012 on sn-devel-104
 2012-01-31 15:21:04 +01:00
Jelmer Vernooij
5c50e08983 replace: use libbsd for strlcat/strlcpy when available. 2012-01-31 13:44:17 +01:00
Amitay Isaacs
bfa951db97 s4-s3-upgrade: Check if there are duplicate sids for users and groups 
Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Tue Jan 31 02:23:17 CET 2012 on sn-devel-104
 2012-01-31 02:23:17 +01:00
Amitay Isaacs
449ca75759 s4-s3-upgrade: Use lowercase hostname as hostname for provision 2012-01-31 00:49:07 +01:00
Jeremy Allison
1fdc96ecaf Fix bug #8139 - smbclient fails if server does not support Echo request. 
Based on work by Matthias Scheler <tron@NetBSD.org>

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Tue Jan 31 00:47:19 CET 2012 on sn-devel-104
 2012-01-31 00:47:19 +01:00
Matthieu Patou
56d5cb9386 s3-winbind: don't try to do clever thing if the username is not found while authenticating through winbind 
This could cause that we authenticate a user with a bogus domain to
winbind's domain if the password supplied for the PAM_AUTH match.

The problem was reported by Jeff Venable (jvenable@juniper.net).
Patch from Andrew Bartlett (abartlett@samba.org).

Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Mon Jan 30 18:58:12 CET 2012 on sn-devel-104
 2012-01-30 18:58:12 +01:00
Matthieu Patou
7350d99409 s3: check that a user in a bogus domain name is mapped to the localnetbios name of a domain member 
This means that if we authentify for BOGUS\administrator in AD domain
FOREST with samba being domain member with the netbiosname MEMBER then
BOGUS\administrator will be mapped to MEMBER\administrator if the
password match.
 2012-01-30 08:23:11 -08:00
Andrew Bartlett
959d13ac20 s3-auth: Remove duplicate check for NT_STATUS_IS_OK(nt_status) 
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Mon Jan 30 09:38:47 CET 2012 on sn-devel-104
 2012-01-30 09:38:46 +01:00
Andrew Bartlett
3ddb983c10 gensec: inline gensec_generate_session_info() into only caller 
This avoids casting to and from the struct auth_user_info_dc *user_info_dc

to to this, the

if (user_info_dc->info->authenticated)

is moved into auth_generate_session_info_wrapper(), which is the
function that gensec_security->auth_context->generate_session_info
points to.

Andrew Bartlett
 2012-01-30 08:05:14 +01:00
Andrew Bartlett
fc035afb6e s4-auth: Return NT_STATUS_NOT_IMPLEMENTED if the challenge cannot be obtained 2012-01-30 08:05:14 +01:00
Andrew Bartlett
a647df4607 auth: Make check_password and generate_session_info hook generic 
gensec_ntlmssp does not need to know the internal form of the
struct user_info_dc or auth_serversupplied_info.  This will allow the
calling logic to be put in common.

Andrew Bartlett
 2012-01-30 08:05:14 +01:00
Rusty Russell
7c6713e78f tdb2: make --enable-tdb2 the default. 
We still use the tdb1 on-disk format, but we do so via the tdb2 library.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Autobuild-User: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date: Mon Jan 30 08:02:43 CET 2012 on sn-devel-104
 2012-01-30 08:02:42 +01:00
Rusty Russell
e1665c94ac tdb2: add -1 and -2 options to tdbtorture 
(For now, -1 is the default).
 2012-01-30 15:59:16 +10:30
Rusty Russell
10230829df tdb2:tdbtorture: use TEST_DATA_PREFIX for files 
TDB2 version of commit b83672b36c.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
 2012-01-30 15:31:05 +10:30
Rusty Russell
45ae436b19 tdb2: name tools the same as TDB1 tools. 
Otherwise, when we switch everyone's scripts will break (including our
own tests!).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
 2012-01-30 10:07:18 +10:30
Rusty Russell
23f1f5e0e3 tdb2: tools/tdb2backup 
Minor changes from tdb/tools/tdbbackup.c.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
 2012-01-30 10:07:17 +10:30