r5948: more compile cleanups from Jason Mader

diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index 6e1b011c37c6b623bbe4a9dfab68f47ed8fb2c51..13e6aa5a3188c75b6e4a0ed6ffd0dc6bccff13b7 100644 (file)
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -1267,7 +1267,7 @@ ADS_STATUS ads_add_service_principal_name(ADS_STRUCT *ads, const char *machine_n
        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_STATUS ads_add_service_principal_name(ADS_STRUCT *ads, const char *machine_n
                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);

diff --git a/source/rpc_server/srv_util.c b/source/rpc_server/srv_util.c
index 802e7673a40b0d04ce1700fcc63c59cdcde8c0bf..79d5d06d23adfe9c10463a2d5f5df058e0487a9d 100644 (file)
--- a/source/rpc_server/srv_util.c
+++ b/source/rpc_server/srv_util.c
@@ -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,7 +79,7 @@ static const rid_name domain_group_rids[] =
     { DOMAIN_GROUP_RID_GUESTS       , "Domain Guests" },
     { 0                             , NULL }
 };
-
+#endif
 
 /*******************************************************************
  gets a domain user's groups from their already-calculated NT_USER_TOKEN