[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  4dcd5ac s3: Do not directly log off after a pam_logon
       via  2ef4acb s3: Fix wbinfo arg for --pam-logon
      from  8768f62 ntlm_check: Fix some nonempty blank lines

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4dcd5ac4424d6003d73a1cac36e2543eba98ae94
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Sep 13 11:31:58 2010 +0200

    s3: Do not directly log off after a pam_logon

commit 2ef4acb2bd67b1b5d483e859705e445c6e01e4cd
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Sep 13 11:31:26 2010 +0200

    s3: Fix wbinfo arg for --pam-logon

-----------------------------------------------------------------------

Summary of changes:
 nsswitch/wbinfo.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index 34bf758..801f92f 100644
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -2016,7 +2016,7 @@ int main(int argc, char **argv, char **envp)
 		{ "sid-aliases", 0, POPT_ARG_STRING, &string_arg, OPT_SIDALIASES, "Get sid aliases", "SID" },
 		{ "user-sids", 0, POPT_ARG_STRING, &string_arg, OPT_USERSIDS, "Get user group sids for user SID", "SID" },
 		{ "authenticate", 'a', POPT_ARG_STRING, &string_arg, 'a', "authenticate user", "user%password" },
-		{ "pam-logon", 0, POPT_ARG_STRING, string_arg, OPT_PAM_LOGON,
+		{ "pam-logon", 0, POPT_ARG_STRING, &string_arg, OPT_PAM_LOGON,
 		  "do a pam logon equivalent", "user%password" },
 		{ "logoff", 0, POPT_ARG_NONE, NULL, OPT_LOGOFF,
 		  "log off user", "uid" },
@@ -2379,6 +2379,7 @@ int main(int argc, char **argv, char **envp)
 					  string_arg);
 				goto done;
 			}
+			break;
 		case OPT_LOGOFF:
 		{
 			wbcErr wbc_status;


-- 
Samba Shared Repository