The branch, master has been updated
via d65f33d Log short_princ instead of uninitialised filter.
via 39ee332 param: handle P_BYTES in more places
from c55db47 script/autobuild.py: cleanup on rebase failure
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d65f33de1d14be22a159211f0c835b6fe170cc14
Author: Michael Wood <esiot...@gmail.com>
Date: Fri Jan 20 08:30:18 2012 +0200
Log short_princ instead of uninitialised filter.
Autobuild-User: Andrew Bartlett <abart...@samba.org>
Autobuild-Date: Sat Jan 21 13:06:35 CET 2012 on sn-devel-104
commit 39ee332f35d42b0c9f53961128a486c01576ea66
Author: Andrew Bartlett <abart...@samba.org>
Date: Sat Jan 21 16:50:43 2012 +1100
param: handle P_BYTES in more places
-----------------------------------------------------------------------
Summary of changes:
lib/param/loadparm.c | 1 +
source3/web/swat.c | 2 ++
source4/kdc/db-glue.c | 11 ++++++-----
3 files changed, 9 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 03ee8f3..ef1e7d9 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2099,6 +2099,7 @@ static void copy_service(struct loadparm_service
*pserviceDest,
break;
case P_INTEGER:
+ case P_BYTES:
case P_OCTAL:
case P_ENUM:
*(int *)dest_ptr = *(int *)src_ptr;
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 3d6aaf4..34974b4 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -409,6 +409,7 @@ static void show_parameter(int snum, struct parm_struct
*parm)
break;
case P_INTEGER:
+ case P_BYTES:
printf("<input type=text size=8 name=\"parm_%s\"
value=\"%d\">", make_parm_name(parm->label), *(int *)ptr);
printf("<input type=button value=\"%s\"
onClick=\"swatform.parm_%s.value=\'%d\'\">",
_("Set Default"),
make_parm_name(parm->label),(int)(parm->def.ivalue));
@@ -499,6 +500,7 @@ static void show_parameters(int snum, int allparameters,
unsigned int parm_filte
break;
case P_INTEGER:
+ case P_BYTES:
case P_OCTAL:
if (*(int *)ptr ==
(int)(parm->def.ivalue)) continue;
break;
diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index ae93b75..77c8430 100644
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -1363,7 +1363,6 @@ static krb5_error_code
samba_kdc_lookup_server(krb5_context context,
} else {
int lret;
- char *filter = NULL;
char *short_princ;
const char *realm;
/* server as client principal case, but we must not lookup
userPrincipalNames */
@@ -1386,16 +1385,18 @@ static krb5_error_code
samba_kdc_lookup_server(krb5_context context,
DSDB_SEARCH_SHOW_EXTENDED_DN |
DSDB_SEARCH_NO_GLOBAL_CATALOG,
"(&(objectClass=user)(samAccountName=%s))",
ldb_binary_encode_string(mem_ctx,
short_princ));
- free(short_princ);
if (lret == LDB_ERR_NO_SUCH_OBJECT) {
- DEBUG(3, ("Failed find a entry for %s\n", filter));
+ DEBUG(3, ("Failed to find an entry for %s\n",
short_princ));
+ free(short_princ);
return HDB_ERR_NOENTRY;
}
if (lret != LDB_SUCCESS) {
- DEBUG(3, ("Failed single search for for %s - %s\n",
- filter, ldb_errstring(kdc_db_ctx->samdb)));
+ DEBUG(3, ("Failed single search for %s - %s\n",
+ short_princ,
ldb_errstring(kdc_db_ctx->samdb)));
+ free(short_princ);
return HDB_ERR_NOENTRY;
}
+ free(short_princ);
}
return 0;
--
Samba Shared Repository
