summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2007-09-11 23:35:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:30:41 -0500
commit1ef2464451ee64023173637fa03e703405dc8c85 (patch)
tree6ea5390ee483a6adaf37b0e73e4c726affb176ae
parentdc58b03517f3cd68107e0645765725c5e9eb6fb1 (diff)
downloadsamba-1ef2464451ee64023173637fa03e703405dc8c85.tar.gz
samba-1ef2464451ee64023173637fa03e703405dc8c85.tar.bz2
samba-1ef2464451ee64023173637fa03e703405dc8c85.zip
r25109: Remove obsolete argument from ads_guess_service_principal().
Guenther (This used to be commit 2dea9464bba76af4315a8207ccd3e564ec19d146)
-rw-r--r--source3/libads/sasl.c5
-rw-r--r--source3/libads/util.c1
2 files changed, 2 insertions, 4 deletions
diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c
index 123ad491fb..a92bef7ecf 100644
--- a/source3/libads/sasl.c
+++ b/source3/libads/sasl.c
@@ -667,8 +667,7 @@ static ADS_STATUS ads_generate_service_principal(ADS_STRUCT *ads,
if (!given_principal ||
strequal(given_principal, ADS_IGNORE_PRINCIPAL)) {
- status = ads_guess_service_principal(ads, given_principal,
- &p->string);
+ status = ads_guess_service_principal(ads, &p->string);
if (!ADS_ERR_OK(status)) {
return status;
}
@@ -1103,7 +1102,7 @@ static ADS_STATUS ads_sasl_gssapi_bind(ADS_STRUCT *ads)
return status;
}
-#endif /* HAVE_GGSAPI */
+#endif /* HAVE_GSSAPI */
/* mapping between SASL mechanisms and functions */
static struct {
diff --git a/source3/libads/util.c b/source3/libads/util.c
index a0c9d8f4c4..af96c3e10a 100644
--- a/source3/libads/util.c
+++ b/source3/libads/util.c
@@ -53,7 +53,6 @@ failed:
}
ADS_STATUS ads_guess_service_principal(ADS_STRUCT *ads,
- const char *given_principal,
char **returned_principal)
{
char *princ = NULL;