The branch, master has been updated via 99c7ee3c9145b6187113ff29500b55a32320a9bc (commit) from d9c0d5823624d302c6fa635d2e44aab985fd307c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 99c7ee3c9145b6187113ff29500b55a32320a9bc Author: Björn Jacke <b...@sernet.de> Date: Tue Jul 14 17:55:50 2009 +0200 s3: make d9c0d58236 better readble and reduce indentation ----------------------------------------------------------------------- Summary of changes: source3/smbd/password.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/password.c b/source3/smbd/password.c index 58824b6..b1a7497 100644 --- a/source3/smbd/password.c +++ b/source3/smbd/password.c @@ -437,22 +437,22 @@ bool user_in_netgroup(struct smbd_server_connection *sconn, fstrcpy(lowercase_user, user); strlower_m(lowercase_user); - if (strcmp(user,lowercase_user) != 0) { - DEBUG(5,("looking for user %s of domain %s in netgroup %s\n", - lowercase_user, - sconn->smb1.sessions.my_yp_domain? - sconn->smb1.sessions.my_yp_domain:"(ANY)", - ngname)); - - if (innetgr(ngname, NULL, lowercase_user, - sconn->smb1.sessions.my_yp_domain)) { - DEBUG(5,("user_in_netgroup: Found\n")); - return true; - } - } else { + if (strcmp(user,lowercase_user) == 0) { /* user name was already lower case! */ return false; } + + DEBUG(5,("looking for user %s of domain %s in netgroup %s\n", + lowercase_user, + sconn->smb1.sessions.my_yp_domain? + sconn->smb1.sessions.my_yp_domain:"(ANY)", + ngname)); + + if (innetgr(ngname, NULL, lowercase_user, + sconn->smb1.sessions.my_yp_domain)) { + DEBUG(5,("user_in_netgroup: Found\n")); + return true; + } #endif /* HAVE_NETGROUP */ return false; } -- Samba Shared Repository