From d43aa3ee3a062dfcbab2f3429af1ce491c6c985d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 28 Feb 2008 08:29:07 +0100 Subject: call libnet_conf_get_seqnum() just once and fix compiler warnings metze (This used to be commit fb352fdbcc3fe378d2aadc4914b981eaa06b35ae) --- source3/param/loadparm.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 79c522f77c..e23c30789a 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -3490,6 +3490,7 @@ bool lp_file_list_changed(void) DEBUG(6, ("lp_file_list_changed()\n")); if (lp_config_backend() == CONFIG_BACKEND_REGISTRY) { + uint64_t conf_cur_seqnum; if (conf_ctx == NULL) { WERROR werr; werr = libnet_conf_open(NULL, &conf_ctx); @@ -3499,12 +3500,12 @@ bool lp_file_list_changed(void) return false; } } - if (conf_last_seqnum != - libnet_conf_get_seqnum(conf_ctx, NULL, NULL)) - { - DEBUGADD(6, ("regdb seqnum changed: old = %lu, " - "new = %lu\n", conf_last_seqnum, - libnet_conf_get_seqnum(conf_ctx, NULL, NULL))); + conf_cur_seqnum = libnet_conf_get_seqnum(conf_ctx, NULL, NULL); + if (conf_last_seqnum != conf_cur_seqnum) { + DEBUGADD(6, ("regdb seqnum changed: old = %llu, " + "new = %llu\n", + (unsigned long long)conf_last_seqnum, + (unsigned long long)conf_cur_seqnum)); return true; } else { /* -- cgit From 732f69eb6b9c8e1ce962dd556dd090343bccdc27 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 28 Feb 2008 09:49:59 +0100 Subject: Update WHATSNEW.txt with my changes for 3.2.0pre2 metze (This used to be commit d18778f329f0c49f1250d93cf1b52603afaf15e1) --- WHATSNEW.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/WHATSNEW.txt b/WHATSNEW.txt index bcdf56c166..f60aa04d54 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -127,6 +127,25 @@ o Kai Blin * make test now supports more extensive SPOOLSS testing using vlp. * Correctly handle mixed-case hostnames in NTLMv2 authentication. +o Stefan Metzmacher + * Fixes for libreplace. + * Build fixes. + * Add nss_wrapper support. + * Start and test winbindd by 'make test' + * Split up child_dispatch_table into domain, idmap and locator tables + in winbindd. + * Fix for a crash bug in pidl generated client code. + This could have happend with [in,out,unique] pointers + when the clients sends a valid pointer, but the server + reponse with a NULL pointer (as samba-3.0.26a do for some calls). + * Change NTSTAUS into enum ndr_err_code in librpc/ndr. + * Remove unused calls in the struct based winbindd protocol. + * Add --configfile option to wbinfo. + * Convert winbind_env_set(), winbind_on() and winbind_off() into macros. + * Return rids and other_sids arrays in WBFLAG_PAM_INFO3_TEXT mode. + * Implement wbcErrorString() and wbcAuthenticateUserEx() + * Convert auth_winbind to use wbcAuthenticateUserEx() + Original 3.2.0pre1 commits: --------------------------- o Michael Adam -- cgit From b2ed9341ee309acf2cb6f81bff4bc9243bf21d55 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 28 Feb 2008 10:14:26 +0100 Subject: Fix segfault in _srv_net_file_enum. Guenther (This used to be commit 6523a051ded9f7b433fcce2d4c4a5f186b5a28f6) --- source3/rpc_server/srv_srvsvc_nt.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index f0680a89e5..37bd204f75 100644 --- a/source3/rpc_server/srv_srvsvc_nt.c +++ b/source3/rpc_server/srv_srvsvc_nt.c @@ -1216,17 +1216,20 @@ done: WERROR _srv_net_file_enum(pipes_struct *p, SRV_Q_NET_FILE_ENUM *q_u, SRV_R_NET_FILE_ENUM *r_u) { + const char *username = NULL; + switch ( q_u->level ) { - case 3: { - char *username; - if (!(username = rpcstr_pull_unistr2_talloc( - p->mem_ctx, q_u->username))) { - return WERR_NOMEM; + case 3: + if (q_u->username) { + username = rpcstr_pull_unistr2_talloc( + p->mem_ctx, q_u->username); + if (!username) { + return WERR_NOMEM; + } } return net_file_enum_3(username, r_u, get_enum_hnd(&q_u->enum_hnd)); - } default: return WERR_UNKNOWN_LEVEL; } -- cgit From 226a17cb3b154eed73417be4a88d7015466c7706 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Thu, 28 Feb 2008 10:16:48 +0100 Subject: Ups... Sorry! Thanks for the hint Volker! :-) Karolin (This used to be commit 1942798c55580ae4777521c077e2766a52fa0192) --- WHATSNEW.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WHATSNEW.txt b/WHATSNEW.txt index f60aa04d54..42eaad4c82 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -187,7 +187,7 @@ o Gerald (Jerry) Carter using remote idmap backends. * Fix LookupNames and LookupSids to use the same resolution heuristics as Windows XP. - * Fix lookups in Winbind when running nscd. + * Fix lockups in Winbind when running nscd. * UPN logon support in pam_winbind. * Add support for GNU linker scripts when build shared libraries (based on work by Julien Cristau and James -- cgit From 9dc87b86137db120834b158063688bfc4f20329b Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Thu, 28 Feb 2008 10:47:18 +0100 Subject: Move my changes to the right section in WHATSNEW. Karolin (This used to be commit c0f486dc46fa9a8ace03e6d147e5fdbd4d6e2f2d) --- WHATSNEW.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 42eaad4c82..d705dd9fa5 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -127,6 +127,7 @@ o Kai Blin * make test now supports more extensive SPOOLSS testing using vlp. * Correctly handle mixed-case hostnames in NTLMv2 authentication. + o Stefan Metzmacher * Fixes for libreplace. * Build fixes. @@ -146,6 +147,14 @@ o Stefan Metzmacher * Implement wbcErrorString() and wbcAuthenticateUserEx() * Convert auth_winbind to use wbcAuthenticateUserEx() + +o Karolin Seeger + * Improve error messages of net subcommands. + * Add 'net rap file user'. + * Change LDAP search filter to find machine accounts which + are not located in the user suffix. + + Original 3.2.0pre1 commits: --------------------------- o Michael Adam @@ -254,10 +263,6 @@ o Jiri Sasek o Karolin Seeger * Add deletelocalgroup and unmapunixgroup subcommand to "net sam". * Cleanup internal passdb functions. - * Improve error messages of net subcommands. - * Add 'net rap file user'. - * Change LDAP search filter to find machine accounts which - are not located in the user suffix. o Simo Sorce -- cgit