1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-14 19:24:43 +03:00

Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

(This used to be commit 1d9d39525a1f1f5e43e86d919f1ced2df568f676)
This commit is contained in:
Jeremy Allison 2008-02-28 02:15:12 -08:00
commit cf297a917f
2 changed files with 38 additions and 11 deletions

View File

@ -127,6 +127,34 @@ o Kai Blin <kai@samba.org>
* make test now supports more extensive SPOOLSS testing using vlp.
* Correctly handle mixed-case hostnames in NTLMv2 authentication.
o Stefan Metzmacher <metze@samba.org>
* 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()
o Karolin Seeger <ks@sernet.de>
* 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 <obnox@samba.org>
@ -168,7 +196,7 @@ o Gerald (Jerry) Carter <jerry@samba.org>
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 <jcristau@debian.org> and James
@ -235,10 +263,6 @@ o Jiri Sasek <Jiri.Sasek@Sun.COM>
o Karolin Seeger <ks@sernet.de>
* 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 <idra@samba.org>

View File

@ -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;
}