svn commit: samba r23848 - in branches/SAMBA_4_0/source: param scripting/ejs

abartlet at samba.org abartlet at samba.org
Thu Jul 12 04:56:34 GMT 2007


Author: abartlet
Date: 2007-07-12 04:56:33 +0000 (Thu, 12 Jul 2007)
New Revision: 23848

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23848

Log:
Thanks to derrell for pointing out that I had not finished my patch to
split out the auth methods.

This caused all SWAT logins to fail, except when using local system
authentication.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/param/loadparm.c
   branches/SAMBA_4_0/source/scripting/ejs/smbcalls_auth.c


Changeset:
Modified: branches/SAMBA_4_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_4_0/source/param/loadparm.c	2007-07-12 00:42:09 UTC (rev 23847)
+++ branches/SAMBA_4_0/source/param/loadparm.c	2007-07-12 04:56:33 UTC (rev 23848)
@@ -147,7 +147,6 @@
 	int cli_maxprotocol;
 	int cli_minprotocol;
 	int security;
-	char **AuthMethods;
 	int paranoid_server_security;
 	int max_wins_ttl;
 	int min_wins_ttl;
@@ -915,7 +914,6 @@
 _PUBLIC_ FN_GLOBAL_INTEGER(lp_cli_maxprotocol, &Globals.cli_maxprotocol)
 _PUBLIC_ FN_GLOBAL_INTEGER(lp_cli_minprotocol, &Globals.cli_minprotocol)
 _PUBLIC_ FN_GLOBAL_INTEGER(lp_security, &Globals.security)
-_PUBLIC_ FN_GLOBAL_LIST(lp_auth_methods, &Globals.AuthMethods)
 _PUBLIC_ FN_GLOBAL_BOOL(lp_paranoid_server_security, &Globals.paranoid_server_security)
 _PUBLIC_ FN_GLOBAL_INTEGER(lp_announce_as, &Globals.announce_as)
 _PUBLIC_ FN_GLOBAL_LIST(lp_js_include, &Globals.jsInclude)

Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_auth.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_auth.c	2007-07-12 00:42:09 UTC (rev 23847)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_auth.c	2007-07-12 04:56:33 UTC (rev 23848)
@@ -55,7 +55,11 @@
 		msg = messaging_client_init(tmp_ctx, ev);
 	}
 
-	nt_status = auth_context_create_methods(tmp_ctx, auth_types, ev, msg, &auth_context);
+	if (auth_types) {
+		nt_status = auth_context_create_methods(tmp_ctx, auth_types, ev, msg, &auth_context);
+	} else {
+		nt_status = auth_context_create(tmp_ctx, ev, msg, &auth_context);
+	}
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
 		mprSetPropertyValue(auth, "report", mprString("Auth System Failure"));
@@ -173,7 +177,7 @@
 	if (domain && (strcmp("SYSTEM USER", domain) == 0)) {
 		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, remote_host, auth_types_unix);
 	} else {
-		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, remote_host, lp_auth_methods());
+		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, remote_host, NULL);
 	}
 
 	mpr_Return(eid, auth);



More information about the samba-cvs mailing list