summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-03-22 14:48:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:10 -0500
commit40295c41dbba119f6b4e32647fb70f51ebf390a0 (patch)
treee4200c2226e26d32400a42e2c77d0cec9fdee45c
parentd2b8348fefdb21811999bef6d344e152c44084b8 (diff)
downloadsamba-40295c41dbba119f6b4e32647fb70f51ebf390a0.tar.gz
samba-40295c41dbba119f6b4e32647fb70f51ebf390a0.tar.bz2
samba-40295c41dbba119f6b4e32647fb70f51ebf390a0.zip
r5948: more compile cleanups from Jason Mader
(This used to be commit cc6c769c3c26164919dd13777d671abe02c084d9)
-rw-r--r--source3/libads/ldap.c7
-rw-r--r--source3/rpc_server/srv_util.c3
2 files changed, 3 insertions, 7 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 6e1b011c37..13e6aa5a31 100644
--- a/source3/libads/ldap.c
+++ b/source3/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/source3/rpc_server/srv_util.c b/source3/rpc_server/srv_util.c
index 802e7673a4..79d5d06d23 100644
--- a/source3/rpc_server/srv_util.c
+++ b/source3/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