svn commit: samba r4988 - branches/SAMBA_3_0/source/passdb trunk/source/passdb

gd at samba.org gd at samba.org
Tue Jan 25 19:56:02 GMT 2005


Author: gd
Date: 2005-01-25 19:56:01 +0000 (Tue, 25 Jan 2005)
New Revision: 4988

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

Log:
After speaking with Jerry, remove old lp_admin_users to
administrator-sid mapping completely.

Guenther

Modified:
   branches/SAMBA_3_0/source/passdb/passdb.c
   trunk/source/passdb/passdb.c


Changeset:
Modified: branches/SAMBA_3_0/source/passdb/passdb.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/passdb.c	2005-01-25 18:17:44 UTC (rev 4987)
+++ branches/SAMBA_3_0/source/passdb/passdb.c	2005-01-25 19:56:01 UTC (rev 4988)
@@ -794,20 +794,6 @@
 		return True;
 	}
 
-	if (rid == DOMAIN_USER_RID_ADMIN) {
-		const char **admin_list = lp_admin_users(-1);
-		*psid_name_use = SID_NAME_USER;
-		if (admin_list) {
-			const char *p = *admin_list;
-			if(!next_token(&p, name, NULL, sizeof(fstring))) {
-				fstrcpy(name, "Administrator");
-			}
-		} else {
-			fstrcpy(name, "Administrator");
-		}
-		return True;
-	}
-
 	if (algorithmic_pdb_rid_is_user(rid)) {
 		uid_t uid;
 		struct passwd *pw = NULL;

Modified: trunk/source/passdb/passdb.c
===================================================================
--- trunk/source/passdb/passdb.c	2005-01-25 18:17:44 UTC (rev 4987)
+++ trunk/source/passdb/passdb.c	2005-01-25 19:56:01 UTC (rev 4988)
@@ -806,20 +806,6 @@
 		return True;
 	}
 
-	if (rid == DOMAIN_USER_RID_ADMIN) {
-		const char **admin_list = lp_admin_users(-1);
-		*psid_name_use = SID_NAME_USER;
-		if (admin_list) {
-			const char *p = *admin_list;
-			if(!next_token(&p, name, NULL, sizeof(fstring))) {
-				fstrcpy(name, "Administrator");
-			}
-		} else {
-			fstrcpy(name, "Administrator");
-		}
-		return True;
-	}
-
 	if (algorithmic_pdb_rid_is_user(rid)) {
 		uid_t uid;
 		struct passwd *pw = NULL;



More information about the samba-cvs mailing list