svn commit: samba r5693 - in trunk/source/sam: .

[vlendec at samba.org]

Author: vlendec
Date: 2005-03-08 17:43:38 +0000 (Tue, 08 Mar 2005)
New Revision: 5693

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

Log:
Merges from 3_0
Modified:
   trunk/source/sam/idmap_rid.c


Changeset:
Modified: trunk/source/sam/idmap_rid.c
===================================================================
--- trunk/source/sam/idmap_rid.c	2005-03-08 17:42:59 UTC (rev 5692)
+++ trunk/source/sam/idmap_rid.c	2005-03-08 17:43:38 UTC (rev 5693)
@@ -51,9 +51,9 @@
 	int i;
 	fstring sid_str;
 	BOOL known_domain = False;
-	p = init_param;
 	fstring tok;
 
+	p = init_param;
 	trust.number = 0;
 
 	/* falling back to automatic mapping when there were no options given */
@@ -146,9 +146,9 @@
 	uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
 	fstring dc_name;
 	struct in_addr dc_ip;
-	char *password = NULL;
-	char *username = NULL;
-	char *domain = NULL;
+	const char *password = NULL;
+	const char *username = NULL;
+	const char *domain = NULL;
 	uint32 info_class = 5;
 	char *domain_name = NULL;
 	DOM_SID *domain_sid, sid;
@@ -159,6 +159,7 @@
 	DOM_SID *trusted_domain_sids;
 	uint32 enum_ctx = 0;
 	DOM_SID builtin_sid;
+	int own_domains = 2;
 
 	/* put the results together */
 	*num_domains = 1;
@@ -270,7 +271,6 @@
 					i, trusted_domain_names[i], sid_str));
 	}
 
-	int own_domains = 2;
 	if (!sid_equal(domain_sid, get_global_sam_sid()))
 		++own_domains;