[SCM] Samba Shared Repository - branch v4-6-test updated

[Karolin Seeger]

The branch, v4-6-test has been updated
       via  632a38e Modify smbspool_krb5_wrapper to just fall through to smbspool if AUTH_INFO_REQUIRED is not set or is not "negotiate".
      from  6bc0acf ctdb-scripts: Initialise CTDB_NFS_CALLOUT in statd-callout

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-6-test


- Log -----------------------------------------------------------------
commit 632a38e05d5a7ed3eeff62aa0720f3ce301ec6e4
Author: Bryan Mason <bmason at redhat.com>
Date:   Wed Feb 15 22:57:42 2017 -0800

    Modify smbspool_krb5_wrapper to just fall through to smbspool if AUTH_INFO_REQUIRED is not set or is not "negotiate".
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12575
    
    Signed-off-by: Bryan Mason <bmason at redhat.com>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    (cherry picked from commit adbdce78ecb4e852596108b69eeb8a4cba32fa83)
    
    Autobuild-User(v4-6-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-6-test): Wed Feb 22 12:41:35 CET 2017 on sn-devel-144

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

Summary of changes:
 source3/client/smbspool_krb5_wrapper.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/client/smbspool_krb5_wrapper.c b/source3/client/smbspool_krb5_wrapper.c
index d26a7a6..bf97d82 100644
--- a/source3/client/smbspool_krb5_wrapper.c
+++ b/source3/client/smbspool_krb5_wrapper.c
@@ -90,27 +90,29 @@ int main(int argc, char *argv[])
 	int cmp;
 	int rc;
 
-	uid = getuid();
-
-	CUPS_SMB_DEBUG("Started with uid=%d\n", uid);
-	if (uid != 0) {
-		goto smbspool;
-	}
-
 	/* Check if AuthInfoRequired is set to negotiate */
 	env = getenv("AUTH_INFO_REQUIRED");
+
+        /* If not set, then just call smbspool. */
 	if (env == NULL) {
 		CUPS_SMB_ERROR("AUTH_INFO_REQUIRED is not set");
-		fprintf(stderr, "ATTR: auth-info-required=negotiate\n");
-		return CUPS_BACKEND_AUTH_REQUIRED;
+                goto smbspool;
+	} else {
+                CUPS_SMB_DEBUG("AUTH_INFO_REQUIRED=%s", env);
+                cmp = strcmp(env, "negotiate");
+                /* If AUTH_INFO_REQUIRED != "negotiate" then call smbspool. */
+                if (cmp != 0) {
+                          CUPS_SMB_ERROR(
+                            "AUTH_INFO_REQUIRED is not set to negotiate");
+                          goto smbspool;
+                }
 	}
 
-	CUPS_SMB_DEBUG("AUTH_INFO_REQUIRED=%s", env);
-	cmp = strcmp(env, "negotiate");
-	if (cmp != 0) {
-		CUPS_SMB_ERROR("AUTH_INFO_REQUIRED is not set to negotiate");
-		fprintf(stderr, "ATTR: auth-info-required=negotiate\n");
-		return CUPS_BACKEND_AUTH_REQUIRED;
+	uid = getuid();
+
+	CUPS_SMB_DEBUG("Started with uid=%d\n", uid);
+	if (uid != 0) {
+		goto smbspool;
 	}
 
 	/*


-- 
Samba Shared Repository