svn commit: samba r5948 - in branches/SAMBA_3_0/source: libads rpc_server

[jerry at samba.org]

Author: jerry
Date: 2005-03-22 14:48:18 +0000 (Tue, 22 Mar 2005)
New Revision: 5948

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

Log:
more compile cleanups from Jason Mader
Modified:
   branches/SAMBA_3_0/source/libads/ldap.c
   branches/SAMBA_3_0/source/rpc_server/srv_util.c


Changeset:
Modified: branches/SAMBA_3_0/source/libads/ldap.c
===================================================================
--- branches/SAMBA_3_0/source/libads/ldap.c	2005-03-22 14:45:43 UTC (rev 5947)
+++ branches/SAMBA_3_0/source/libads/ldap.c	2005-03-22 14:48:18 UTC (rev 5948)
@@ -1267,7 +1267,7 @@
 	ADS_STATUS ret;
 	TALLOC_CTX *ctx;
 	LDAPMessage *res = NULL;
-	char *host_spn, *host_upn, *psp1, *psp2, *psp3;
+	char *host_spn, *psp1, *psp2, *psp3;
 	ADS_MODLIST mods;
 	fstring my_fqdn;
 	char *dn_string = NULL;
@@ -1297,11 +1297,6 @@
 		ads_msgfree(ads, res);
 		return ADS_ERROR(LDAP_NO_SUCH_OBJECT);
 	}
-	if (!(host_upn = talloc_asprintf(ctx, "%s@%s", host_spn, ads->config.realm))) {
-		talloc_destroy(ctx);
-		ads_msgfree(ads, res);
-		return ADS_ERROR(LDAP_NO_SUCH_OBJECT);
-	}
 
 	/* Add the extra principal */
 	psp1 = talloc_asprintf(ctx, "%s/%s", spn, machine_name);

Modified: branches/SAMBA_3_0/source/rpc_server/srv_util.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_util.c	2005-03-22 14:45:43 UTC (rev 5947)
+++ branches/SAMBA_3_0/source/rpc_server/srv_util.c	2005-03-22 14:48:18 UTC (rev 5948)
@@ -42,6 +42,7 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 
+#if 0	/* these aren't used currently but are here if you need them */
 /*
  * A list of the rids of well known BUILTIN and Domain users
  * and groups.
@@ -78,8 +79,8 @@
     { DOMAIN_GROUP_RID_GUESTS       , "Domain Guests" },
     { 0                             , NULL }
 };
+#endif
 
-
 /*******************************************************************
  gets a domain user's groups from their already-calculated NT_USER_TOKEN
  ********************************************************************/