[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3247-g760de2d
The branch, v3-2-test has been updated via 760de2d48940ed88aca1fa459e4af455b541940c (commit) from 5dfccee083490eea8230a5965cb52b01ddf5041e (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 760de2d48940ed88aca1fa459e4af455b541940c Author: Karolin Seeger [EMAIL PROTECTED] Date: Wed Dec 10 09:28:49 2008 +0100 WHATSNEW: Update changes. Karolin --- Summary of changes: WHATSNEW.txt |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 769ae24..447844b 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -10,7 +10,10 @@ Major enhancements included in Samba 3.2.6 are: o Fix Winbind crash bugs. o Fix moving of readonly files. + o Fix write list in setups using security = share. o Fix access to cups-printers with cups 1.3.4. + o Fix timeouts in setups with large groups. + o Fix several bugs concerning Alternate Data Streams. o Add new SMB traffic analyzer VFS module. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-5-197-g32dcaab
The branch, v3-2-stable has been updated via 32dcaab09e893c9a33629dccc5103ad67e8231fd (commit) via 7e4b110c88153150babdb220683a1b8441f067bd (commit) from 1e7c488097d67457632778a09e7f82db5d0e93e3 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log - commit 32dcaab09e893c9a33629dccc5103ad67e8231fd Author: Karolin Seeger [EMAIL PROTECTED] Date: Wed Dec 10 09:28:49 2008 +0100 WHATSNEW: Update changes. Karolin (cherry picked from commit 760de2d48940ed88aca1fa459e4af455b541940c) commit 7e4b110c88153150babdb220683a1b8441f067bd Author: SATOH Fumiyasu [EMAIL PROTECTED] Date: Tue Dec 9 14:26:39 2008 -0800 Fix bug #5688 LPQ process is orphaned if socket address parameter is invalid Karolin please pull for 3-2-stable. Jeremy (cherry picked from commit 5dfccee083490eea8230a5965cb52b01ddf5041e) --- Summary of changes: WHATSNEW.txt |3 +++ source/printing/printing.c | 39 +-- 2 files changed, 36 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 769ae24..447844b 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -10,7 +10,10 @@ Major enhancements included in Samba 3.2.6 are: o Fix Winbind crash bugs. o Fix moving of readonly files. + o Fix write list in setups using security = share. o Fix access to cups-printers with cups 1.3.4. + o Fix timeouts in setups with large groups. + o Fix several bugs concerning Alternate Data Streams. o Add new SMB traffic analyzer VFS module. diff --git a/source/printing/printing.c b/source/printing/printing.c index af89852..9bd237c 100644 --- a/source/printing/printing.c +++ b/source/printing/printing.c @@ -1394,7 +1394,19 @@ main thread of the background lpq updater / void start_background_queue(void) { + /* Use local variables for this as we don't +* need to save the parent side of this, just +* ensure it closes when the process exits. +*/ + int pause_pipe[2]; + DEBUG(3,(start_background_queue: Starting background LPQ thread\n)); + + if (pipe(pause_pipe) == -1) { + DEBUG(5,(start_background_queue: cannot create pipe. %s\n, strerror(errno) )); + exit(1); + } + background_lpq_updater_pid = sys_fork(); if (background_lpq_updater_pid == -1) { @@ -1406,6 +1418,9 @@ void start_background_queue(void) /* Child. */ DEBUG(5,(start_background_queue: background LPQ thread started\n)); + close(pause_pipe[0]); + pause_pipe[0] = -1; + if (!reinit_after_fork(smbd_messaging_context(), true)) { DEBUG(0,(reinit_after_fork() failed\n)); smb_panic(reinit_after_fork() failed); @@ -1420,13 +1435,23 @@ void start_background_queue(void) messaging_register(smbd_messaging_context(), NULL, MSG_PRINTER_UPDATE, print_queue_receive); - + DEBUG(5,(start_background_queue: background LPQ thread waiting for messages\n)); while (1) { - pause(); - + fd_set pause_fds; + int pause_select; + + FD_ZERO(pause_fds); + FD_SET(pause_pipe[1], pause_fds); + pause_select = sys_select(pause_pipe[1]+1, pause_fds, NULL, NULL, NULL); + /* If pause_pipe[0] is closed it means the parent smbd +* and children exited or aborted. */ + if (pause_select == 1) { +exit_server_cleanly(NULL); + } + /* check for some essential signals first */ - + if (got_sig_term) { exit_server_cleanly(NULL); } @@ -1437,9 +1462,9 @@ void start_background_queue(void) reload_services(False); reload_after_sighup = 0; } - + /* now check for messages */ - + DEBUG(10,(start_background_queue: background LPQ thread got a message\n)); message_dispatch(smbd_messaging_context()); @@ -1449,6 +1474,8 @@ void start_background_queue(void) 0); } } + + close(pause_pipe[1]); }
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3250-g1ac0175
The branch, v3-2-test has been updated via 1ac0175bb13ce34fbb2deaa880a4021625b259be (commit) via bfd02c2d2391a5c4faea4f7c1c1fb22d527218a3 (commit) via 16a4f8f7dc59c6b586259b2d5daf1b23d25b2d7f (commit) from 760de2d48940ed88aca1fa459e4af455b541940c (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 1ac0175bb13ce34fbb2deaa880a4021625b259be Author: Günther Deschner [EMAIL PROTECTED] Date: Tue Nov 18 17:06:53 2008 +0100 s3: merge german pam_winbind message translations from master. Guenther (cherry picked from commit aa0ef2f97d98e7ca80636a4dc8093d2034d0dbf1) commit bfd02c2d2391a5c4faea4f7c1c1fb22d527218a3 Author: Günther Deschner [EMAIL PROTECTED] Date: Mon Nov 24 16:32:18 2008 +0100 s3-build: re-run make samba3-idl. Guenther (cherry picked from commit c28e83417dc67083b06fb060f5382ceb082bbdcd) commit 16a4f8f7dc59c6b586259b2d5daf1b23d25b2d7f Author: Günther Deschner [EMAIL PROTECTED] Date: Mon Nov 24 16:31:49 2008 +0100 samr: fix samr_UserInfo24 and samr_UserInfo26. Guenther (cherry picked from commit 0315308cbc724bbf54b7767b4af307217833f541) --- Summary of changes: source/librpc/gen_ndr/ndr_samr.c | 12 ++-- source/librpc/gen_ndr/samr.h |4 +- source/librpc/idl/samr.idl |4 +- source/locale/pam_winbind/de.po | 181 ++ 4 files changed, 191 insertions(+), 10 deletions(-) create mode 100644 source/locale/pam_winbind/de.po Changeset truncated at 500 lines: diff --git a/source/librpc/gen_ndr/ndr_samr.c b/source/librpc/gen_ndr/ndr_samr.c index 9c5a886..bd87a50 100644 --- a/source/librpc/gen_ndr/ndr_samr.c +++ b/source/librpc/gen_ndr/ndr_samr.c @@ -2961,7 +2961,7 @@ static enum ndr_err_code ndr_push_samr_UserInfo24(struct ndr_push *ndr, int ndr_ if (ndr_flags NDR_SCALARS) { NDR_CHECK(ndr_push_align(ndr, 1)); NDR_CHECK(ndr_push_samr_CryptPassword(ndr, NDR_SCALARS, r-password)); - NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r-pw_len)); + NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r-password_expired)); } if (ndr_flags NDR_BUFFERS) { } @@ -2973,7 +2973,7 @@ static enum ndr_err_code ndr_pull_samr_UserInfo24(struct ndr_pull *ndr, int ndr_ if (ndr_flags NDR_SCALARS) { NDR_CHECK(ndr_pull_align(ndr, 1)); NDR_CHECK(ndr_pull_samr_CryptPassword(ndr, NDR_SCALARS, r-password)); - NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, r-pw_len)); + NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, r-password_expired)); } if (ndr_flags NDR_BUFFERS) { } @@ -2985,7 +2985,7 @@ _PUBLIC_ void ndr_print_samr_UserInfo24(struct ndr_print *ndr, const char *name, ndr_print_struct(ndr, name, samr_UserInfo24); ndr-depth++; ndr_print_samr_CryptPassword(ndr, password, r-password); - ndr_print_uint8(ndr, pw_len, r-pw_len); + ndr_print_uint8(ndr, password_expired, r-password_expired); ndr-depth--; } @@ -3074,7 +3074,7 @@ static enum ndr_err_code ndr_push_samr_UserInfo26(struct ndr_push *ndr, int ndr_ if (ndr_flags NDR_SCALARS) { NDR_CHECK(ndr_push_align(ndr, 1)); NDR_CHECK(ndr_push_samr_CryptPasswordEx(ndr, NDR_SCALARS, r-password)); - NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r-pw_len)); + NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r-password_expired)); } if (ndr_flags NDR_BUFFERS) { } @@ -3086,7 +3086,7 @@ static enum ndr_err_code ndr_pull_samr_UserInfo26(struct ndr_pull *ndr, int ndr_ if (ndr_flags NDR_SCALARS) { NDR_CHECK(ndr_pull_align(ndr, 1)); NDR_CHECK(ndr_pull_samr_CryptPasswordEx(ndr, NDR_SCALARS, r-password)); - NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, r-pw_len)); + NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, r-password_expired)); } if (ndr_flags NDR_BUFFERS) { } @@ -3098,7 +3098,7 @@ _PUBLIC_ void ndr_print_samr_UserInfo26(struct ndr_print *ndr, const char *name, ndr_print_struct(ndr, name, samr_UserInfo26); ndr-depth++; ndr_print_samr_CryptPasswordEx(ndr, password, r-password); - ndr_print_uint8(ndr, pw_len, r-pw_len); + ndr_print_uint8(ndr, password_expired, r-password_expired); ndr-depth--; } diff --git a/source/librpc/gen_ndr/samr.h b/source/librpc/gen_ndr/samr.h index 522c6a9..108e9c5 100644 --- a/source/librpc/gen_ndr/samr.h +++ b/source/librpc/gen_ndr/samr.h @@ -499,7 +499,7 @@ struct samr_UserInfo23 { struct samr_UserInfo24 { struct samr_CryptPassword password; - uint8_t pw_len; + uint8_t password_expired; }; struct
[SCM] Samba Shared Repository - branch master updated - 9ea4b5aac254bbe689c00c613db2b2288046be78
The branch, master has been updated via 9ea4b5aac254bbe689c00c613db2b2288046be78 (commit) via b431406357a7c9580e797a3d4f96d9b1fe9f2e86 (commit) via e5804204901c7b376516e42a3a86d685236fd198 (commit) via c4a5788e821ddcba125464ef0fc8172c0100d959 (commit) via 9fa4dfc4ea1c27aecd74cd89d50e674c4614ebd3 (commit) via 5903206bab97bb694a8689692d9381747246c5ba (commit) from cbe6e2a77602a802ad1f8b1ffd9f38c3119f3000 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 9ea4b5aac254bbe689c00c613db2b2288046be78 Author: Günther Deschner [EMAIL PROTECTED] Date: Wed Dec 10 12:47:05 2008 +0100 s4-smbtorture: skip ServerGetTrustInfo for samba4. Guenther commit b431406357a7c9580e797a3d4f96d9b1fe9f2e86 Author: Günther Deschner [EMAIL PROTECTED] Date: Wed Dec 10 02:54:06 2008 +0100 s3-netlogon: fix netlogon server build. Guenther commit e5804204901c7b376516e42a3a86d685236fd198 Author: Günther Deschner [EMAIL PROTECTED] Date: Wed Dec 10 02:53:36 2008 +0100 s3-build: re-run make samba3-idl. Guenther commit c4a5788e821ddcba125464ef0fc8172c0100d959 Author: Günther Deschner [EMAIL PROTECTED] Date: Wed Dec 10 02:51:49 2008 +0100 s4-smbtorture: add simple netr_ServerGetTrustInfo test. Guenther commit 9fa4dfc4ea1c27aecd74cd89d50e674c4614ebd3 Author: Günther Deschner [EMAIL PROTECTED] Date: Wed Dec 10 02:51:16 2008 +0100 s4-netlogon: fix the build of netlogon server. Guenther commit 5903206bab97bb694a8689692d9381747246c5ba Author: Günther Deschner [EMAIL PROTECTED] Date: Wed Dec 10 02:50:46 2008 +0100 netlogon: fill in netr_ServerGetTrustInfo IDL. Guenther --- Summary of changes: librpc/idl/netlogon.idl | 20 ++- source3/include/proto.h |4 +- source3/librpc/gen_ndr/cli_netlogon.c | 32 ++- source3/librpc/gen_ndr/cli_netlogon.h | 15 +- source3/librpc/gen_ndr/ndr_netlogon.c | 344 - source3/librpc/gen_ndr/ndr_netlogon.h |5 +- source3/librpc/gen_ndr/netlogon.h | 21 ++- source3/librpc/gen_ndr/srv_netlogon.c | 41 +++- source3/librpc/gen_ndr/srv_netlogon.h |2 +- source3/rpc_server/srv_netlog_nt.c|4 +- source4/rpc_server/netlogon/dcerpc_netlogon.c |8 +- source4/selftest/knownfail|1 + source4/torture/rpc/netlogon.c| 42 +++ 13 files changed, 497 insertions(+), 42 deletions(-) Changeset truncated at 500 lines: diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl index cf4da7a..f09e51e 100644 --- a/librpc/idl/netlogon.idl +++ b/librpc/idl/netlogon.idl @@ -1500,5 +1500,23 @@ interface netlogon // /* Function 0x2e */ - [todo] WERROR netr_NETRSERVERGETTRUSTINFO(); + + typedef struct { + uint32 count; + [size_is(count)] uint32 *data; + uint32 entry_count; + [size_is(count)] lsa_String *entries; + } netr_TrustInfo; + + NTSTATUS netr_ServerGetTrustInfo( + [in,unique] [string,charset(UTF16)] uint16 *server_name, + [in,ref] [string,charset(UTF16)] uint16 *account_name, + [in] netr_SchannelType secure_channel_type, + [in,ref] [string,charset(UTF16)] uint16 *computer_name, + [in,ref] netr_Authenticator *credential, + [out,ref] netr_Authenticator *return_authenticator, + [out,ref] samr_Password *new_owf_password, + [out,ref] samr_Password *old_owf_password, + [out,ref] netr_TrustInfo **trust_info + ); } diff --git a/source3/include/proto.h b/source3/include/proto.h index 2ba01b3..4feedcd 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -6859,8 +6859,8 @@ WERROR _netr_GetForestTrustInformation(pipes_struct *p, struct netr_GetForestTrustInformation *r); NTSTATUS _netr_LogonSamLogonWithFlags(pipes_struct *p, struct netr_LogonSamLogonWithFlags *r); -WERROR _netr_NETRSERVERGETTRUSTINFO(pipes_struct *p, - struct netr_NETRSERVERGETTRUSTINFO *r); +WERROR _netr_ServerGetTrustInfo(pipes_struct *p, + struct netr_ServerGetTrustInfo *r); /* The following definitions come from rpc_server/srv_ntsvcs.c */ diff --git a/source3/librpc/gen_ndr/cli_netlogon.c b/source3/librpc/gen_ndr/cli_netlogon.c index 1af3249..a1bcb2c 100644 --- a/source3/librpc/gen_ndr/cli_netlogon.c +++ b/source3/librpc/gen_ndr/cli_netlogon.c @@ -2296,23 +2296,37 @@ NTSTATUS rpccli_netr_LogonSamLogonWithFlags(struct rpc_pipe_client
[SCM] Samba Shared Repository - annotated tag release-3-2-6 created - release-3-2-6
The annotated tag, release-3-2-6 has been created at 134d865e08c8a2d16f478a044022b8d2194d5a8c (tag) tagging 54e3135523d8c592b76d3929c5fd127c62f7f969 (commit) replaces release-3-2-5 tagged by Karolin Seeger on Wed Dec 10 12:51:37 2008 +0100 - Log - tag release-3-2-6 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.4-svn0 (GNU/Linux) iD8DBQBJP64YbzORW2Vot+oRAtl/AJ4zAqYJMO2hbcBxTYAzbfb/kcQ3DgCePl3I vAxt1UrYFmYVF+vl7mXx+tw= =LFPZ -END PGP SIGNATURE- Andreas Schneider (2): Delete the krb5 ccname variable from the PAM environment if set. Fix circular dependency error with autoconf 2.6.3. Andrew Tridgell (3): fixed segv on startup with trusted domains re-added winbind:ignore domains patch use glibc sys/inotify.h header Carsten Dumke (1): net: Fix documentation of net rap printq info Dan Sledz (3): FreeBSD configure check for backtrace_symbols Allow SYSLOG_FACILITY to be modified with a new configure option called --with-syslog-facility Fix logging to syslog Davide Sfriso (1): Fix bug #5906 when running winbindd on a Samba PDC. Winbindd crash on 'getent group'. Derrell Lipman (2): Fix bug 5805: don't close stdout Error return is boolean false, not -1 Dina Fine (1): Fix bug #5908 - Samba 3.0.32 - internal change notify on share directory fails Gerald (Jerry) Carter (2): libaddns: Use the same prerequisite for DDNS update as Windows XP. net_dns: Make lwinet ads dns register honor the interfaces parameter. Günther Deschner (27): build: don't install the cifs.upcall binary twice. s3-srvsvc: fix _srvsvc_NetShareAdd segfault. s3-samr-server: be consistent when reporting we do password complexity. s3-samr-server: _samr_DeleteUser needs to wipe out the user_handle on success. s3-samr-server: fix access check in _samr_QuerySecurity(). s3-samr-server: fix return code in _samr_QueryDisplayInformation. s3-samr-server: unify callback convention: _samr_QueryDomainInfo. s3-samr-server: unify callback convention: _samr_UserSetInfo. auth: Fix build warning. Fix PNP_GetHwProfInfo() (fixes Bug: #5888). re-run make idl. re-run make idl. make some more parts of security.idl public and re-run make idl. winbind: fix build warning. fix build warning. Fix Bug #5898. (net rpc shutdown fails). s3-samr: fix _samr_LookupNames return code. s3-ldapsam: Fix Bug 5957: do not abort rename process on valid rename script. samr: fix samr_UserInfo24 and samr_UserInfo26. s3-build: re-run make samba3-idl. s3: merge german pam_winbind message translations from master. rpc_client: add init_samr_CryptPasswordEx and init_samr_CryptPassword. rpc_client: use init_samr_CryptPassword(Ex) in client tools. s3-samr: fix init_samr_user_info{23,24} callers. s3-samr: add init_samr_user_info25 and init_samr_user_info26. s3-libnetjoin: remove unused md4_trust_password, found by metze. s3-libnetjoin: Fix bug #5749. Re-set acctflags while joining. fix from metze. Henning Henkel (1): Fix bug #5929 - vfs_prealloc does not build with option --with-cluster-support and GPFS Holger Hetterich (5): SMB traffic analyzer vfs module from Holger Hetterich [EMAIL PROTECTED] Add an initial version of a manpage for the vfs_smb_traffic_analyzer module. Enable optional anonymization of user names, Update the manpage for vfs_smb_traffic_analyzer to include the anonymize_prefix option Fix the Premature end of data in tag error when buiding the manpage, fix a typo in the text, add an example for anonymization usage. Jeff Layton (3): mount.cifs: have uppercase_string return success on NULL pointer mount.cifs: make return codes match the return codes for /bin/mount (try #3) mount.cifs: use lock/unlock_mtab scheme from util-linux-ng mount prog Jelmer Vernooij (1): Avoid freeing fsp twice when opening new_file fails. (Debian #431696) Jeremy Allison (56): Fix bug #5783 FindFirst fails where search pattern == mangled filename. Fix winbindd crash in an unusual failure mode. Bug #5737. Based on original patch from [EMAIL PROTECTED] Fix bug #5790 samba returns STATUS_OBJECT_NAME_NOT_FOUND on set file disposition. Use IPv4/v6 independent calls. Change safe_strcpy/cat to strlcpy/cat (this Fix bug #5797 - Moving readonly files fails. Reported by [EMAIL PROTECTED] Second part of the fix for bug #5790 - samba returns STATUS_OBJECT_NAME_NOT_FOUND on set file disposition call. Ensure we null out fsp after a close in all paths. Fix the make test problem Karolin reported. Now rename_open_files actually works correctly we must emit the change notify before we change the name, not before. Restructure the module so it
svn commit: samba-web r1252 - in trunk: . devel history
Author: kseeger Date: 2008-12-10 12:50:11 + (Wed, 10 Dec 2008) New Revision: 1252 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1252 Log: Announce Samba 3.2.6 Karolin Added: trunk/history/samba-3.2.6.html Modified: trunk/devel/index.html trunk/header_columns.html trunk/history/header_history.html trunk/history/index.html trunk/index.html Changeset: Sorry, the patch is too large (544 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1252
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-5-206-g54e3135
The branch, v3-2-stable has been updated via 54e3135523d8c592b76d3929c5fd127c62f7f969 (commit) via 3bd2171a21573f361b5349fde23f32954acded68 (commit) via 73c5a41fadbbb370e9550c3835328e82529dc40f (commit) via 222b07d9f471ef5cd6588989fdf5665863ef20e1 (commit) via 585fae3738863639711644f56fa9a0145161a570 (commit) via 0c26dd0cf567a952443878bbac5b6499c8d1e769 (commit) via d9679a4d2f9791cecee58b297a54d9a942807717 (commit) via fe4a949edad252ad81fb717de03fa1dc028165fe (commit) via 8618d11934b2a93e40a922bcea499229b2b90ba4 (commit) from 32dcaab09e893c9a33629dccc5103ad67e8231fd (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log - commit 54e3135523d8c592b76d3929c5fd127c62f7f969 Author: Günther Deschner [EMAIL PROTECTED] Date: Sat Nov 29 00:12:26 2008 +0100 s3-libnetjoin: Fix bug #5749. Re-set acctflags while joining. fix from metze. Guenther (cherry picked from commit bc3a277455dd4557e796ddc0bef0f52a11f889e7) (cherry picked from commit a6a8025d48e63a8bcb1fb03efa8ab85e415f8a38) commit 3bd2171a21573f361b5349fde23f32954acded68 Author: Günther Deschner [EMAIL PROTECTED] Date: Sat Nov 29 00:10:18 2008 +0100 s3-libnetjoin: remove unused md4_trust_password, found by metze. Guenther (cherry picked from commit f479fdc29813c3452fd22c4a2780f0bc5066e664) (cherry picked from commit a4164a55b5b20ae347a22810405c738f868d8493) commit 73c5a41fadbbb370e9550c3835328e82529dc40f Author: Günther Deschner [EMAIL PROTECTED] Date: Fri Nov 28 11:15:29 2008 +0100 s3-samr: add init_samr_user_info25 and init_samr_user_info26. Guenther (cherry picked from commit b51eaa4a4da0dfc46919e9a544b3d26569a1495c) commit 222b07d9f471ef5cd6588989fdf5665863ef20e1 Author: Günther Deschner [EMAIL PROTECTED] Date: Mon Nov 24 18:49:37 2008 +0100 s3-samr: fix init_samr_user_info{23,24} callers. Guenther (cherry picked from commit 948a2e5d38b5d69e3c65e81d0b0fd750410bc066) commit 585fae3738863639711644f56fa9a0145161a570 Author: Günther Deschner [EMAIL PROTECTED] Date: Wed Jul 30 19:52:56 2008 +0200 rpc_client: use init_samr_CryptPassword(Ex) in client tools. Guenther (cherry picked from commit 97f7f9f21f17e8414de15953cf4eaa9959dc6f75) (cherry picked from commit 458e85603673e04577fc493528c870c3d5ec6b54) commit 0c26dd0cf567a952443878bbac5b6499c8d1e769 Author: Günther Deschner [EMAIL PROTECTED] Date: Fri Jul 18 20:42:55 2008 +0200 rpc_client: add init_samr_CryptPasswordEx and init_samr_CryptPassword. Guenther (cherry picked from commit 599155842583781736933ef340e37fd5c87f88ca) commit d9679a4d2f9791cecee58b297a54d9a942807717 Author: Günther Deschner [EMAIL PROTECTED] Date: Tue Nov 18 17:06:53 2008 +0100 s3: merge german pam_winbind message translations from master. Guenther (cherry picked from commit aa0ef2f97d98e7ca80636a4dc8093d2034d0dbf1) (cherry picked from commit 1ac0175bb13ce34fbb2deaa880a4021625b259be) commit fe4a949edad252ad81fb717de03fa1dc028165fe Author: Günther Deschner [EMAIL PROTECTED] Date: Mon Nov 24 16:32:18 2008 +0100 s3-build: re-run make samba3-idl. Guenther (cherry picked from commit c28e83417dc67083b06fb060f5382ceb082bbdcd) (cherry picked from commit bfd02c2d2391a5c4faea4f7c1c1fb22d527218a3) commit 8618d11934b2a93e40a922bcea499229b2b90ba4 Author: Günther Deschner [EMAIL PROTECTED] Date: Mon Nov 24 16:31:49 2008 +0100 samr: fix samr_UserInfo24 and samr_UserInfo26. Guenther (cherry picked from commit 0315308cbc724bbf54b7767b4af307217833f541) (cherry picked from commit 16a4f8f7dc59c6b586259b2d5daf1b23d25b2d7f) --- Summary of changes: source/libnet/libnet_join.c | 76 source/librpc/gen_ndr/ndr_samr.c | 12 ++-- source/librpc/gen_ndr/samr.h |4 +- source/librpc/idl/samr.idl |4 +- source/locale/pam_winbind/de.po | 181 ++ source/rpc_client/init_samr.c| 144 -- source/utils/net_rpc.c | 25 +++--- source/utils/net_rpc_join.c | 12 ++-- 8 files changed, 383 insertions(+), 75 deletions(-) create mode 100644 source/locale/pam_winbind/de.po Changeset truncated at 500 lines: diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c index 7451cb2..526a0bd 100644 --- a/source/libnet/libnet_join.c +++ b/source/libnet/libnet_join.c @@ -734,15 +734,13 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx, struct lsa_String lsa_acct_name; uint32_t user_rid; uint32_t acct_flags = ACB_WSTRUST; - uchar pwbuf[532]; - struct MD5Context md5ctx; - uchar md5buffer[16]; - DATA_BLOB digested_session_key; -
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3256-ga6a8025
The branch, v3-2-test has been updated via a6a8025d48e63a8bcb1fb03efa8ab85e415f8a38 (commit) via a4164a55b5b20ae347a22810405c738f868d8493 (commit) via b51eaa4a4da0dfc46919e9a544b3d26569a1495c (commit) via 948a2e5d38b5d69e3c65e81d0b0fd750410bc066 (commit) via 458e85603673e04577fc493528c870c3d5ec6b54 (commit) via 599155842583781736933ef340e37fd5c87f88ca (commit) from 1ac0175bb13ce34fbb2deaa880a4021625b259be (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit a6a8025d48e63a8bcb1fb03efa8ab85e415f8a38 Author: Günther Deschner [EMAIL PROTECTED] Date: Sat Nov 29 00:12:26 2008 +0100 s3-libnetjoin: Fix bug #5749. Re-set acctflags while joining. fix from metze. Guenther (cherry picked from commit bc3a277455dd4557e796ddc0bef0f52a11f889e7) commit a4164a55b5b20ae347a22810405c738f868d8493 Author: Günther Deschner [EMAIL PROTECTED] Date: Sat Nov 29 00:10:18 2008 +0100 s3-libnetjoin: remove unused md4_trust_password, found by metze. Guenther (cherry picked from commit f479fdc29813c3452fd22c4a2780f0bc5066e664) commit b51eaa4a4da0dfc46919e9a544b3d26569a1495c Author: Günther Deschner [EMAIL PROTECTED] Date: Fri Nov 28 11:15:29 2008 +0100 s3-samr: add init_samr_user_info25 and init_samr_user_info26. Guenther commit 948a2e5d38b5d69e3c65e81d0b0fd750410bc066 Author: Günther Deschner [EMAIL PROTECTED] Date: Mon Nov 24 18:49:37 2008 +0100 s3-samr: fix init_samr_user_info{23,24} callers. Guenther commit 458e85603673e04577fc493528c870c3d5ec6b54 Author: Günther Deschner [EMAIL PROTECTED] Date: Wed Jul 30 19:52:56 2008 +0200 rpc_client: use init_samr_CryptPassword(Ex) in client tools. Guenther (cherry picked from commit 97f7f9f21f17e8414de15953cf4eaa9959dc6f75) commit 599155842583781736933ef340e37fd5c87f88ca Author: Günther Deschner [EMAIL PROTECTED] Date: Fri Jul 18 20:42:55 2008 +0200 rpc_client: add init_samr_CryptPasswordEx and init_samr_CryptPassword. Guenther --- Summary of changes: source/libnet/libnet_join.c | 76 +++--- source/rpc_client/init_samr.c | 144 +++-- source/utils/net_rpc.c| 25 source/utils/net_rpc_join.c | 12 ++-- 4 files changed, 192 insertions(+), 65 deletions(-) Changeset truncated at 500 lines: diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c index 7451cb2..526a0bd 100644 --- a/source/libnet/libnet_join.c +++ b/source/libnet/libnet_join.c @@ -734,15 +734,13 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx, struct lsa_String lsa_acct_name; uint32_t user_rid; uint32_t acct_flags = ACB_WSTRUST; - uchar pwbuf[532]; - struct MD5Context md5ctx; - uchar md5buffer[16]; - DATA_BLOB digested_session_key; - uchar md4_trust_password[16]; struct samr_Ids user_rids; struct samr_Ids name_types; union samr_UserInfo user_info; + struct samr_CryptPassword crypt_pwd; + struct samr_CryptPasswordEx crypt_pwd_ex; + ZERO_STRUCT(sam_pol); ZERO_STRUCT(domain_pol); ZERO_STRUCT(user_pol); @@ -870,23 +868,6 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx, goto done; } - /* Create a random machine account password and generate the hash */ - - E_md4hash(r-in.machine_password, md4_trust_password); - encode_pw_buffer(pwbuf, r-in.machine_password, STR_UNICODE); - - generate_random_buffer((uint8_t*)md5buffer, sizeof(md5buffer)); - digested_session_key = data_blob_talloc(mem_ctx, 0, 16); - - MD5Init(md5ctx); - MD5Update(md5ctx, md5buffer, sizeof(md5buffer)); - MD5Update(md5ctx, cli-user_session_key.data, - cli-user_session_key.length); - MD5Final(digested_session_key.data, md5ctx); - - SamOEMhashBlob(pwbuf, sizeof(pwbuf), digested_session_key); - memcpy(pwbuf[516], md5buffer, sizeof(md5buffer)); - /* Fill in the additional account flags now */ acct_flags |= ACB_PWNOEXP; @@ -897,33 +878,50 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx, ;; } - /* Set password and account flags on machine account */ - - ZERO_STRUCT(user_info.info25); - - user_info.info25.info.fields_present = ACCT_NT_PWD_SET | - ACCT_LM_PWD_SET | - SAMR_FIELD_ACCT_FLAGS; - - user_info.info25.info.acct_flags = acct_flags; - memcpy(user_info.info25.password.data, pwbuf, sizeof(pwbuf)); + /* Set account flags on machine account */ + ZERO_STRUCT(user_info.info16); +
[SCM] Samba Shared Repository - branch master updated - 21b9dec990b08a104600bf8e408e64e805a02835
The branch, master has been updated via 21b9dec990b08a104600bf8e408e64e805a02835 (commit) via 31543640e6227e8dc808e365ba0bf6d2d5b08727 (commit) via c7521b25e9f364ced3fbdee3ccb463e93e97a1c3 (commit) via 6bb2fff0c14bd886a1d7995e5ce01f5938689372 (commit) from 9ea4b5aac254bbe689c00c613db2b2288046be78 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 21b9dec990b08a104600bf8e408e64e805a02835 Author: Volker Lendecke [EMAIL PROTECTED] Date: Wed Dec 10 03:17:19 2008 +0100 Pass the get_real_filename operation through the VFS This is done to help file systems that can tell us about the real upper/lower case combination given a case-insensitive file name. The sample I will soon push is the gpfs module (recent gpfs has a get_real_filename function), others might have a similar function to help alleviate the 1million files in a single directory problem. Jeremy, please comment! Thanks, Volker commit 31543640e6227e8dc808e365ba0bf6d2d5b08727 Author: Volker Lendecke [EMAIL PROTECTED] Date: Wed Dec 10 03:03:51 2008 +0100 Change get_real_filename() to unix syscall conventions, make it non-static It sets errno, so it might as well return 0/-1. commit c7521b25e9f364ced3fbdee3ccb463e93e97a1c3 Author: Volker Lendecke [EMAIL PROTECTED] Date: Tue Dec 9 13:50:22 2008 +0100 Apply some const commit 6bb2fff0c14bd886a1d7995e5ce01f5938689372 Author: Volker Lendecke [EMAIL PROTECTED] Date: Tue Dec 9 13:40:41 2008 +0100 Rename scan_directory to get_real_filename --- Summary of changes: source3/include/vfs.h |8 source3/include/vfs_macros.h |3 +++ source3/modules/vfs_default.c | 12 source3/smbd/filename.c | 32 +++- 4 files changed, 38 insertions(+), 17 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 383cd32..d02d14b 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -210,6 +210,7 @@ typedef enum _vfs_op_type { SMB_VFS_OP_CHFLAGS, SMB_VFS_OP_FILE_ID_CREATE, SMB_VFS_OP_STREAMINFO, + SMB_VFS_OP_GET_REAL_FILENAME, /* NT ACL operations. */ @@ -375,6 +376,12 @@ struct vfs_ops { unsigned int *num_streams, struct stream_struct **streams); + int (*get_real_filename)(struct vfs_handle_struct *handle, +const char *path, +const char *name, +TALLOC_CTX *mem_ctx, +char **found_name); + /* NT ACL operations. */ NTSTATUS (*fget_nt_acl)(struct vfs_handle_struct *handle, @@ -510,6 +517,7 @@ struct vfs_ops { struct vfs_handle_struct *chflags; struct vfs_handle_struct *file_id_create; struct vfs_handle_struct *streaminfo; + struct vfs_handle_struct *get_real_filename; /* NT ACL operations. */ diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index fa5dad8..b008d86 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -85,6 +85,7 @@ #define SMB_VFS_CHFLAGS(conn, path, flags) ((conn)-vfs.ops.chflags((conn)-vfs.handles.chflags, (path), (flags))) #define SMB_VFS_FILE_ID_CREATE(conn, dev, inode) ((conn)-vfs.ops.file_id_create((conn)-vfs.handles.file_id_create, (dev), (inode))) #define SMB_VFS_STREAMINFO(conn, fsp, fname, mem_ctx, num_streams, streams) ((conn)-vfs.ops.streaminfo((conn)-vfs.handles.streaminfo, (fsp), (fname), (mem_ctx), (num_streams), (streams))) +#define SMB_VFS_GET_REAL_FILENAME(conn, path, name, mem_ctx, found_name) ((conn)-vfs.ops.get_real_filename((conn)-vfs.handles.get_real_filename, (path), (name), (mem_ctx), (found_name))) /* NT ACL operations. */ #define SMB_VFS_FGET_NT_ACL(fsp, security_info, ppdesc) ((fsp)-conn-vfs.ops.fget_nt_acl((fsp)-conn-vfs.handles.fget_nt_acl, (fsp), (security_info), (ppdesc))) @@ -211,6 +212,7 @@ #define SMB_VFS_OPAQUE_CHFLAGS(conn, path, flags) ((conn)-vfs_opaque.ops.chflags((conn)-vfs_opaque.handles.chflags, (path), (flags))) #define SMB_VFS_OPAQUE_FILE_ID_CREATE(conn, dev, inode) ((conn)-vfs.ops_opaque.file_id_create((conn)-vfs_opaque.handles.file_id_create, (dev), (inode))) #define SMB_VFS_OPAQUE_STREAMINFO(conn, fsp, fname, mem_ctx, num_streams, streams) ((conn)-vfs_opaque.ops.streaminfo((conn)-vfs_opaque.handles.streaminfo, (fsp), (fname), (mem_ctx), (num_streams), (streams))) +#define SMB_VFS_OPAQUE_GET_REAL_FILENAME(conn, path, name, mem_ctx, found_name)
[SCM] Samba Shared Repository - branch master updated - 3c93c96fd0fe362c35fe8127058f94868abc9342
The branch, master has been updated via 3c93c96fd0fe362c35fe8127058f94868abc9342 (commit) via b37684ffcec4ba0beada55d37bcaf4f5e79bcd58 (commit) via a4b52118d44906882677ed1234428d8025134036 (commit) via a0efc4cffbd84898c454d27eaf946d073dfdad0f (commit) from 21b9dec990b08a104600bf8e408e64e805a02835 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 3c93c96fd0fe362c35fe8127058f94868abc9342 Author: Volker Lendecke [EMAIL PROTECTED] Date: Wed Dec 10 18:17:59 2008 +0100 Also search for -lgpfs which is available as GPL in GPFS PTF8 commit b37684ffcec4ba0beada55d37bcaf4f5e79bcd58 Author: Volker Lendecke [EMAIL PROTECTED] Date: Wed Dec 10 12:32:24 2008 +0100 Make use of smbd_gpfs_get_realfilename_path in unix_convert commit a4b52118d44906882677ed1234428d8025134036 Author: Volker Lendecke [EMAIL PROTECTED] Date: Wed Dec 10 03:22:04 2008 +0100 Fix nonempty blank lines in vfs_gpfs.c commit a0efc4cffbd84898c454d27eaf946d073dfdad0f Author: Volker Lendecke [EMAIL PROTECTED] Date: Wed Dec 10 18:10:03 2008 +0100 Fix some merge omissions for GPFS --- Summary of changes: packaging/RHEL-CTDB/configure.rpm | 67 +- source3/configure.in | 14 +++ source3/modules/gpfs.c| 35 ++- source3/modules/vfs_gpfs.c| 179 + 4 files changed, 210 insertions(+), 85 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm index 7596040..358b40d 100755 --- a/packaging/RHEL-CTDB/configure.rpm +++ b/packaging/RHEL-CTDB/configure.rpm @@ -1,37 +1,56 @@ +#!/bin/sh case `uname -m` in - x86_64) - libdir=/usr/lib64/samba - ;; - *) - libdir=/usr/lib/samba - ;; + x86_64) + _libarch=lib64 + ;; + *) + _libarch=lib + ;; esac -CFLAGS=-Wall -g -D_GNU_SOURCE ./configure \ ---prefix=/usr \ ---localstatedir=/var \ ---with-configdir=/etc/samba \ ---with-libdir=$libdir \ ---with-lockdir=/var/lib/samba \ ---with-logfilebase=/var/log/samba \ ---with-mandir=/usr/man \ ---with-piddir=/var/run \ ---with-privatedir=/etc/samba \ ---with-sambabook=/usr/share/swat/using_samba \ ---with-swatdir=/usr/share/swat \ +_libarchdir=/usr/${_libarch} + +_prefix=/usr +_sysconfdir=/etc +_mandir=/usr/man +_datadir=/usr/share + +# check for ccache +ccache -h 21 /dev/null +if [ $? -eq 0 ]; then + CC=ccache gcc +else + CC=gcc +fi + +./autogen.sh + +CC=$CC CFLAGS=-Wall -g -D_GNU_SOURCE ./configure -C \ + --prefix=${_prefix} \ + --localstatedir=/var \ + --with-configdir=${_sysconfdir}/samba \ + --with-libdir=${_libarchdir}/samba \ + --with-pammodulesdir=/${_libarch}/security \ + --with-lockdir=/var/lib/samba \ + --with-logfilebase=/var/log/samba \ + --with-mandir=${_mandir} \ + --with-piddir=/var/run \ + --with-privatedir=${_sysconfdir}/samba \ + --with-sambabook=${_datadir}/swat/using_samba \ + --with-swatdir=${_datadir}/swat \ --disable-cups \ ---with-acl-support \ + --with-acl-support \ --with-ads \ ---with-automount \ ---with-fhs \ + --with-automount \ + --with-fhs \ --with-pam_smbpass \ --with-libsmbclient \ --with-libsmbsharemodes \ ---without-smbwrapper \ + --without-smbwrapper \ --with-pam \ --with-quotas \ - --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2 \ + --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,vfs_gpfs \ --with-syslog \ --with-utmp \ --with-cluster-support \ @@ -40,3 +59,5 @@ CFLAGS=-Wall -g -D_GNU_SOURCE ./configure \ --without-dnsupdate \ --with-aio-support \ $* + +make showlayout diff --git a/source3/configure.in b/source3/configure.in index 40e78e8..b90b1b3 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1052,6 +1052,20 @@ if test x$samba_cv_HAVE_GPFS = xyes; then fi LIBS=$save_LIBS +printf %s checking for GPFS libs (with 3.2.1 PTF8 available as GPL)... +save_LIBS=$LIBS +LIBS=$LIBS -lgpfs +AC_TRY_LINK([#include gpfs.h], + [gpfs_set_share(0,GPFS_SHARE_READ,GPFS_DENY_NONE)], + samba_cv_HAVE_GPFS=yes, + samba_cv_HAVE_GPFS=no) +echo $samba_cv_HAVE_GPFS +if test x$samba_cv_HAVE_GPFS = xyes; then +AC_DEFINE(HAVE_GPFS,1,[Whether GPFS GPL libs are available]) +default_shared_modules=$default_shared_modules vfs_gpfs +fi +LIBS=$save_LIBS + # # check if building on Isilon OneFS printf %s checking for Isilon OneFS... diff
[SCM] Samba Shared Repository - branch master updated - c044b09572631cbdd686e5dbbdfbcc731145533a
The branch, master has been updated via c044b09572631cbdd686e5dbbdfbcc731145533a (commit) from 3c93c96fd0fe362c35fe8127058f94868abc9342 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit c044b09572631cbdd686e5dbbdfbcc731145533a Author: Volker Lendecke [EMAIL PROTECTED] Date: Wed Dec 10 16:58:40 2008 +0100 Fix the build Crap, too many trees and no instant, infinitely fast rebuild --- Summary of changes: source3/include/proto.h|4 source3/modules/vfs_gpfs.c |9 - 2 files changed, 4 insertions(+), 9 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/proto.h b/source3/include/proto.h index 4feedcd..7fa6266 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -7896,6 +7896,10 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx, char **pp_saved_last_component, SMB_STRUCT_STAT *pst); NTSTATUS check_name(connection_struct *conn, const char *name); +int get_real_filename(connection_struct *conn, const char *path, + const char *name, TALLOC_CTX *mem_ctx, + char **found_name); + /* The following definitions come from smbd/files.c */ diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index 780bd9b..fae08dd 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -446,11 +446,6 @@ static NTSTATUS gpfsacl_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp return gpfsacl_set_nt_acl_internal(fsp, security_info_sent, psd); } -static NTSTATUS gpfsacl_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, char *name, uint32 security_info_sent, SEC_DESC *psd) -{ - return gpfsacl_set_nt_acl_internal(fsp, security_info_sent, psd); -} - static SMB_ACL_T gpfs2smb_acl(const struct gpfs_acl *pacl) { SMB_ACL_T result; @@ -895,10 +890,6 @@ static vfs_op_tuple gpfs_op_tuples[] = { SMB_VFS_OP_FSET_NT_ACL, SMB_VFS_LAYER_TRANSPARENT }, -{ SMB_VFS_OP(gpfsacl_set_nt_acl), - SMB_VFS_OP_SET_NT_ACL, - SMB_VFS_LAYER_TRANSPARENT }, - { SMB_VFS_OP(gpfsacl_sys_acl_get_file), SMB_VFS_OP_SYS_ACL_GET_FILE, SMB_VFS_LAYER_TRANSPARENT }, -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 7c2bdead9e3e4436e427668a16df367e14885cbc
The branch, master has been updated via 7c2bdead9e3e4436e427668a16df367e14885cbc (commit) via 8d641826595e3be8864097d4aea7a76879c173d6 (commit) via 1896ccb24732fc9a3407224209d741640dd602d3 (commit) via 0114cb52ca552bc8c70d6f8160ca5a481e41154d (commit) via 7ad9676864a70366c3165c6f35e5c8665bc6468d (commit) from c044b09572631cbdd686e5dbbdfbcc731145533a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 7c2bdead9e3e4436e427668a16df367e14885cbc Author: Volker Lendecke [EMAIL PROTECTED] Date: Wed Dec 10 23:14:46 2008 +0100 Revert Fix some merge omissions for GPFS This reverts commit a0efc4cffbd84898c454d27eaf946d073dfdad0f. This one should have been done with careful cherry-picks, sorry. Volker commit 8d641826595e3be8864097d4aea7a76879c173d6 Author: Volker Lendecke [EMAIL PROTECTED] Date: Wed Dec 10 23:14:16 2008 +0100 Revert Fix nonempty blank lines in vfs_gpfs.c This reverts commit a4b52118d44906882677ed1234428d8025134036. commit 1896ccb24732fc9a3407224209d741640dd602d3 Author: Volker Lendecke [EMAIL PROTECTED] Date: Wed Dec 10 23:14:01 2008 +0100 Revert Make use of smbd_gpfs_get_realfilename_path in unix_convert This reverts commit b37684ffcec4ba0beada55d37bcaf4f5e79bcd58. commit 0114cb52ca552bc8c70d6f8160ca5a481e41154d Author: Volker Lendecke [EMAIL PROTECTED] Date: Wed Dec 10 23:13:48 2008 +0100 Revert Also search for -lgpfs which is available as GPL in GPFS PTF8 This reverts commit 3c93c96fd0fe362c35fe8127058f94868abc9342. commit 7ad9676864a70366c3165c6f35e5c8665bc6468d Author: Volker Lendecke [EMAIL PROTECTED] Date: Wed Dec 10 23:13:34 2008 +0100 Revert Fix the build This reverts commit c044b09572631cbdd686e5dbbdfbcc731145533a. --- Summary of changes: packaging/RHEL-CTDB/configure.rpm | 67 +-- source3/configure.in | 14 --- source3/include/proto.h |4 - source3/modules/gpfs.c| 35 +--- source3/modules/vfs_gpfs.c| 170 5 files changed, 85 insertions(+), 205 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm index 358b40d..7596040 100755 --- a/packaging/RHEL-CTDB/configure.rpm +++ b/packaging/RHEL-CTDB/configure.rpm @@ -1,56 +1,37 @@ -#!/bin/sh case `uname -m` in - x86_64) - _libarch=lib64 - ;; - *) - _libarch=lib - ;; + x86_64) + libdir=/usr/lib64/samba + ;; + *) + libdir=/usr/lib/samba + ;; esac -_libarchdir=/usr/${_libarch} - -_prefix=/usr -_sysconfdir=/etc -_mandir=/usr/man -_datadir=/usr/share - -# check for ccache -ccache -h 21 /dev/null -if [ $? -eq 0 ]; then - CC=ccache gcc -else - CC=gcc -fi - -./autogen.sh - -CC=$CC CFLAGS=-Wall -g -D_GNU_SOURCE ./configure -C \ - --prefix=${_prefix} \ - --localstatedir=/var \ - --with-configdir=${_sysconfdir}/samba \ - --with-libdir=${_libarchdir}/samba \ - --with-pammodulesdir=/${_libarch}/security \ - --with-lockdir=/var/lib/samba \ - --with-logfilebase=/var/log/samba \ - --with-mandir=${_mandir} \ - --with-piddir=/var/run \ - --with-privatedir=${_sysconfdir}/samba \ - --with-sambabook=${_datadir}/swat/using_samba \ - --with-swatdir=${_datadir}/swat \ +CFLAGS=-Wall -g -D_GNU_SOURCE ./configure \ +--prefix=/usr \ +--localstatedir=/var \ +--with-configdir=/etc/samba \ +--with-libdir=$libdir \ +--with-lockdir=/var/lib/samba \ +--with-logfilebase=/var/log/samba \ +--with-mandir=/usr/man \ +--with-piddir=/var/run \ +--with-privatedir=/etc/samba \ +--with-sambabook=/usr/share/swat/using_samba \ +--with-swatdir=/usr/share/swat \ --disable-cups \ - --with-acl-support \ +--with-acl-support \ --with-ads \ - --with-automount \ - --with-fhs \ +--with-automount \ +--with-fhs \ --with-pam_smbpass \ --with-libsmbclient \ --with-libsmbsharemodes \ - --without-smbwrapper \ +--without-smbwrapper \ --with-pam \ --with-quotas \ - --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,vfs_gpfs \ + --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2 \ --with-syslog \ --with-utmp \ --with-cluster-support \ @@ -59,5 +40,3 @@ CC=$CC CFLAGS=-Wall -g -D_GNU_SOURCE ./configure -C \ --without-dnsupdate \ --with-aio-support \ $* - -make showlayout diff --git a/source3/configure.in b/source3/configure.in index b90b1b3..40e78e8 100644 ---
[SCM] Samba Shared Repository - branch master updated - 94c44fcb6b9c67d3fac39b290c05c718b2980443
The branch, master has been updated via 94c44fcb6b9c67d3fac39b290c05c718b2980443 (commit) from 7c2bdead9e3e4436e427668a16df367e14885cbc (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 94c44fcb6b9c67d3fac39b290c05c718b2980443 Author: Andreas Schneider [EMAIL PROTECTED] Date: Tue Dec 9 13:18:06 2008 +0100 Move the doxygen comments of wbclient to the header file. So that a developer who wants to use the wbclient api can read the documentation in the header file. Signed-off-by: Andreas Schneider [EMAIL PROTECTED] Signed-off-by: Michael Adam [EMAIL PROTECTED] --- Summary of changes: source3/nsswitch/libwbclient/wbc_guid.c | 18 +- source3/nsswitch/libwbclient/wbc_idmap.c | 131 +--- source3/nsswitch/libwbclient/wbc_pam.c | 96 +-- source3/nsswitch/libwbclient/wbc_pwd.c | 99 +-- source3/nsswitch/libwbclient/wbc_sid.c | 61 + source3/nsswitch/libwbclient/wbc_util.c | 78 +- source3/nsswitch/libwbclient/wbclient.c |8 +- source3/nsswitch/libwbclient/wbclient.h | 488 -- 8 files changed, 524 insertions(+), 455 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/nsswitch/libwbclient/wbc_guid.c b/source3/nsswitch/libwbclient/wbc_guid.c index 0cb33e9..c343e24 100644 --- a/source3/nsswitch/libwbclient/wbc_guid.c +++ b/source3/nsswitch/libwbclient/wbc_guid.c @@ -24,14 +24,7 @@ #include libwbclient.h -/** @brief Convert a binary GUID to a character string - * - * @param guid Binary Guid - * @param **guid_string Resulting character string - * - * @return #wbcErr - **/ - +/* Convert a binary GUID to a character string */ wbcErr wbcGuidToString(const struct wbcGuid *guid, char **guid_string) { @@ -59,14 +52,7 @@ done: return wbc_status; } -/** @brief Convert a character string to a binary GUID - * - * @param *str Character string - * @param guid Resulting binary GUID - * - * @return #wbcErr - **/ - +/* @brief Convert a character string to a binary GUID */ wbcErr wbcStringToGuid(const char *str, struct wbcGuid *guid) { diff --git a/source3/nsswitch/libwbclient/wbc_idmap.c b/source3/nsswitch/libwbclient/wbc_idmap.c index 81b369c..5b2ab87 100644 --- a/source3/nsswitch/libwbclient/wbc_idmap.c +++ b/source3/nsswitch/libwbclient/wbc_idmap.c @@ -24,15 +24,7 @@ #include libwbclient.h -/** @brief Convert a Windows SID to a Unix uid, allocating an uid if needed - * - * @param *sidPointer to the domain SID to be resolved - * @param *puid Pointer to the resolved uid_t value - * - * @return #wbcErr - * - **/ - +/* Convert a Windows SID to a Unix uid, allocating an uid if needed */ wbcErr wbcSidToUid(const struct wbcDomainSid *sid, uid_t *puid) { struct winbindd_request request; @@ -71,30 +63,14 @@ wbcErr wbcSidToUid(const struct wbcDomainSid *sid, uid_t *puid) return wbc_status; } -/** @brief Convert a Windows SID to a Unix uid if there already is a mapping - * - * @param *sidPointer to the domain SID to be resolved - * @param *puid Pointer to the resolved uid_t value - * - * @return #wbcErr - * - **/ - +/* Convert a Windows SID to a Unix uid if there already is a mapping */ wbcErr wbcQuerySidToUid(const struct wbcDomainSid *sid, uid_t *puid) { return WBC_ERR_NOT_IMPLEMENTED; } -/** @brief Convert a Unix uid to a Windows SID, allocating a SID if needed - * - * @param uid Unix uid to be resolved - * @param *sidPointer to the resolved domain SID - * - * @return #wbcErr - * - **/ - +/* Convert a Unix uid to a Windows SID, allocating a SID if needed */ wbcErr wbcUidToSid(uid_t uid, struct wbcDomainSid *sid) { wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE; @@ -127,15 +103,7 @@ done: return wbc_status; } -/** @brief Convert a Unix uid to a Windows SID if there already is a mapping - * - * @param uid Unix uid to be resolved - * @param *sidPointer to the resolved domain SID - * - * @return #wbcErr - * - **/ - +/* Convert a Unix uid to a Windows SID if there already is a mapping */ wbcErr wbcQueryUidToSid(uid_t uid, struct wbcDomainSid *sid) { @@ -189,14 +157,7 @@ wbcErr wbcSidToGid(const struct wbcDomainSid *sid, gid_t *pgid) return wbc_status; } -/** @brief Convert a Windows SID to a Unix gid if there already is a mapping - * - * @param *sidPointer to the domain SID to be resolved - * @param *pgid Pointer to the resolved gid_t value - * - * @return #wbcErr - * - **/ +/* Convert a Windows SID to a Unix gid if there already is a mapping */ wbcErr wbcQuerySidToGid(const struct wbcDomainSid *sid, gid_t *pgid) @@ -204,15 +165,7
[SCM] Samba Shared Repository - branch master updated - f4f477f4320835245d5d45546a7dee8dc1f4100c
The branch, master has been updated via f4f477f4320835245d5d45546a7dee8dc1f4100c (commit) via e0a0b0a0cb3db426d05b641e1fa43d9e7f28ab71 (commit) from 94c44fcb6b9c67d3fac39b290c05c718b2980443 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f4f477f4320835245d5d45546a7dee8dc1f4100c Author: Michael Adam [EMAIL PROTECTED] Date: Mon Dec 1 03:05:40 2008 +0100 packaging(RHEL-CTDB): explicitly build the gpfs module to prevent potetential problems on PTF8 systems where there is no valid autodetecting configure check yet. Michael (cherry picked from commit 37039d345e9a25654bef038f2b8bb4b891cfa6f0) Signed-off-by: Michael Adam [EMAIL PROTECTED] commit e0a0b0a0cb3db426d05b641e1fa43d9e7f28ab71 Author: Michael Adam [EMAIL PROTECTED] Date: Thu Sep 18 05:02:14 2008 +0200 packaging(RHEL-CTDB): adapt configure.rpm to changes to the spec file Michael (cherry picked from commit d249a9ca2a1761f20655cbcfe39fbc942547974d) Signed-off-by: Michael Adam [EMAIL PROTECTED] --- Summary of changes: packaging/RHEL-CTDB/configure.rpm | 68 +++ packaging/RHEL-CTDB/samba.spec.tmpl |2 +- 2 files changed, 46 insertions(+), 24 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm index 7596040..b9a1ee1 100755 --- a/packaging/RHEL-CTDB/configure.rpm +++ b/packaging/RHEL-CTDB/configure.rpm @@ -1,37 +1,56 @@ +#!/bin/sh case `uname -m` in - x86_64) - libdir=/usr/lib64/samba - ;; - *) - libdir=/usr/lib/samba - ;; + x86_64) + _libarch=lib64 + ;; + *) + _libarch=lib + ;; esac -CFLAGS=-Wall -g -D_GNU_SOURCE ./configure \ ---prefix=/usr \ ---localstatedir=/var \ ---with-configdir=/etc/samba \ ---with-libdir=$libdir \ ---with-lockdir=/var/lib/samba \ ---with-logfilebase=/var/log/samba \ ---with-mandir=/usr/man \ ---with-piddir=/var/run \ ---with-privatedir=/etc/samba \ ---with-sambabook=/usr/share/swat/using_samba \ ---with-swatdir=/usr/share/swat \ +_libarchdir=/usr/${_libarch} + +_prefix=/usr +_sysconfdir=/etc +_mandir=/usr/man +_datadir=/usr/share + +# check for ccache +ccache -h 21 /dev/null +if [ $? -eq 0 ]; then + CC=ccache gcc +else + CC=gcc +fi + +./autogen.sh + +CC=$CC CFLAGS=-Wall -g -D_GNU_SOURCE ./configure -C \ + --prefix=${_prefix} \ + --localstatedir=/var \ + --with-configdir=${_sysconfdir}/samba \ + --with-libdir=${_libarchdir}/samba \ + --with-pammodulesdir=/${_libarch}/security \ + --with-lockdir=/var/lib/samba \ + --with-logfilebase=/var/log/samba \ + --with-mandir=${_mandir} \ + --with-piddir=/var/run \ + --with-privatedir=${_sysconfdir}/samba \ + --with-sambabook=${_datadir}/swat/using_samba \ + --with-swatdir=${_datadir}/swat \ --disable-cups \ ---with-acl-support \ + --with-acl-support \ --with-ads \ ---with-automount \ ---with-fhs \ + --with-automount \ + --with-fhs \ --with-pam_smbpass \ --with-libsmbclient \ --with-libsmbsharemodes \ ---without-smbwrapper \ + --without-smbwrapper \ --with-pam \ --with-quotas \ - --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2 \ + --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,vfs_gpfs \ --with-syslog \ --with-utmp \ --with-cluster-support \ @@ -40,3 +59,6 @@ CFLAGS=-Wall -g -D_GNU_SOURCE ./configure \ --without-dnsupdate \ --with-aio-support \ $* + +make showlayout + diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index b34f01f..910fe37 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -167,7 +167,7 @@ CFLAGS=$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE ./configure \ --without-smbwrapper \ --with-pam \ --with-quotas \ - --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2 \ + --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,vfs_gpfs \ --with-syslog \ --with-utmp \ --with-cluster-support \ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 8e0cce5b38c4d12ff490eadecb028155b6eb5dce
The branch, master has been updated via 8e0cce5b38c4d12ff490eadecb028155b6eb5dce (commit) from f4f477f4320835245d5d45546a7dee8dc1f4100c (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8e0cce5b38c4d12ff490eadecb028155b6eb5dce Author: Volker Lendecke [EMAIL PROTECTED] Date: Wed Oct 1 12:26:55 2008 +0200 s3:modules/gpfs: Fix nonempty blank lines --- Summary of changes: source3/modules/gpfs.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/gpfs.c b/source3/modules/gpfs.c index 4e76b97..7caa810 100644 --- a/source3/modules/gpfs.c +++ b/source3/modules/gpfs.c @@ -43,7 +43,7 @@ bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask, if (!gpfs_share_modes) { return True; } - + if (gpfs_set_share_fn == NULL) { return False; } @@ -104,7 +104,7 @@ int set_gpfs_lease(int fd, int leasetype) if (leasetype == F_WRLCK) { gpfs_type = GPFS_LEASE_WRITE; } - + /* we unconditionally set CAP_LEASE, rather than looking for -1/EACCES as there is a bug in some versions of libgpfs_gpl.so which results in a leaked fd on /dev/ss0 -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 1c6a87604f535f3e78f0798bb8b2a6408f2c93d9
The branch, master has been updated via 1c6a87604f535f3e78f0798bb8b2a6408f2c93d9 (commit) via 57a9380f7b4ec25fe7bc7a8da73310ce8969e8d1 (commit) via 110bb2244931d0979461e75e5ff83b2ba21e2fc4 (commit) via de8bb1725540d7fd12fe76b6b0da719309b41d69 (commit) from 8e0cce5b38c4d12ff490eadecb028155b6eb5dce (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 1c6a87604f535f3e78f0798bb8b2a6408f2c93d9 Author: Volker Lendecke [EMAIL PROTECTED] Date: Wed Dec 10 16:58:40 2008 +0100 Fix the build Crap, too many trees and no instant, infinitely fast rebuild Signed-off-by: Michael Adam [EMAIL PROTECTED] commit 57a9380f7b4ec25fe7bc7a8da73310ce8969e8d1 Author: Volker Lendecke [EMAIL PROTECTED] Date: Wed Dec 10 18:17:59 2008 +0100 Also search for -lgpfs which is available as GPL in GPFS PTF8 (cherry picked from commit 3c93c96fd0fe362c35fe8127058f94868abc9342) Signed-off-by: Michael Adam [EMAIL PROTECTED] commit 110bb2244931d0979461e75e5ff83b2ba21e2fc4 Author: Volker Lendecke [EMAIL PROTECTED] Date: Wed Dec 10 12:32:24 2008 +0100 Make use of smbd_gpfs_get_realfilename_path in unix_convert (cherry picked from commit b37684ffcec4ba0beada55d37bcaf4f5e79bcd58) Signed-off-by: Michael Adam [EMAIL PROTECTED] commit de8bb1725540d7fd12fe76b6b0da719309b41d69 Author: Volker Lendecke [EMAIL PROTECTED] Date: Wed Dec 10 03:22:04 2008 +0100 Fix nonempty blank lines in vfs_gpfs.c Signed-off-by: Michael Adam [EMAIL PROTECTED] --- Summary of changes: source3/configure.in | 14 source3/include/proto.h|3 + source3/modules/gpfs.c | 25 +++ source3/modules/vfs_gpfs.c | 166 +--- 4 files changed, 153 insertions(+), 55 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/configure.in b/source3/configure.in index 40e78e8..b90b1b3 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1052,6 +1052,20 @@ if test x$samba_cv_HAVE_GPFS = xyes; then fi LIBS=$save_LIBS +printf %s checking for GPFS libs (with 3.2.1 PTF8 available as GPL)... +save_LIBS=$LIBS +LIBS=$LIBS -lgpfs +AC_TRY_LINK([#include gpfs.h], + [gpfs_set_share(0,GPFS_SHARE_READ,GPFS_DENY_NONE)], + samba_cv_HAVE_GPFS=yes, + samba_cv_HAVE_GPFS=no) +echo $samba_cv_HAVE_GPFS +if test x$samba_cv_HAVE_GPFS = xyes; then +AC_DEFINE(HAVE_GPFS,1,[Whether GPFS GPL libs are available]) +default_shared_modules=$default_shared_modules vfs_gpfs +fi +LIBS=$save_LIBS + # # check if building on Isilon OneFS printf %s checking for Isilon OneFS... diff --git a/source3/include/proto.h b/source3/include/proto.h index 4feedcd..4028f6d 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -7896,6 +7896,9 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx, char **pp_saved_last_component, SMB_STRUCT_STAT *pst); NTSTATUS check_name(connection_struct *conn, const char *name); +int get_real_filename(connection_struct *conn, const char *path, + const char *name, TALLOC_CTX *mem_ctx, + char **found_name); /* The following definitions come from smbd/files.c */ diff --git a/source3/modules/gpfs.c b/source3/modules/gpfs.c index 7caa810..1659900 100644 --- a/source3/modules/gpfs.c +++ b/source3/modules/gpfs.c @@ -31,6 +31,8 @@ static int (*gpfs_set_share_fn)(int fd, unsigned int allow, unsigned int deny); static int (*gpfs_set_lease_fn)(int fd, unsigned int leaseType); static int (*gpfs_getacl_fn)(char *pathname, int flags, void *acl); static int (*gpfs_putacl_fn)(char *pathname, int flags, void *acl); +static int (*gpfs_get_realfilename_path_fn)(char *pathname, char *filenamep, + int *buflen); bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask, @@ -134,6 +136,17 @@ int smbd_gpfs_putacl(char *pathname, int flags, void *acl) return gpfs_putacl_fn(pathname, flags, acl); } +int smbd_gpfs_get_realfilename_path(char *pathname, char *filenamep, + int *buflen) +{ + if (gpfs_get_realfilename_path_fn == NULL) { + errno = ENOSYS; + return -1; + } + + return gpfs_get_realfilename_path_fn(pathname, filenamep, buflen); +} + static bool init_gpfs_function_lib(void *plibhandle_pointer, const char *libname, void *pfn_pointer, const char *fn_name) @@ -142,6 +155,9 @@ static bool init_gpfs_function_lib(void *plibhandle_pointer, void **libhandle_pointer = (void **)plibhandle_pointer; void **fn_pointer = (void **)pfn_pointer; + DEBUG(10,
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4612-g6a4b068
The branch, v3-3-test has been updated via 6a4b0683e05ecc0bf57a1601c741582576f31b23 (commit) from c39c35f3e67a726c6464c1497e46fe7a2eb3dc77 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 6a4b0683e05ecc0bf57a1601c741582576f31b23 Author: Jeremy Allison [EMAIL PROTECTED] Date: Wed Dec 10 15:20:06 2008 -0800 Fix usrmgr opening a user object as non-root. Jeremy. --- Summary of changes: source/rpc_server/srv_samr_nt.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c index d807f3a..4ee3ed6 100644 --- a/source/rpc_server/srv_samr_nt.c +++ b/source/rpc_server/srv_samr_nt.c @@ -2710,7 +2710,7 @@ NTSTATUS _samr_QueryUserInfo(pipes_struct *p, return NT_STATUS_INVALID_HANDLE; status = access_check_samr_function(info-acc_granted, - SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT, + SAMR_USER_ACCESS_GET_ATTRIBUTES, _samr_QueryUserInfo); if (!NT_STATUS_IS_OK(status)) { return status; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3257-g239a2d0
The branch, v3-2-test has been updated via 239a2d0ac6f1b56d67d7fffdb7388a3008eeb4e2 (commit) from a6a8025d48e63a8bcb1fb03efa8ab85e415f8a38 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 239a2d0ac6f1b56d67d7fffdb7388a3008eeb4e2 Author: Jeremy Allison [EMAIL PROTECTED] Date: Wed Dec 10 15:22:02 2008 -0800 Fix usrmgr opening a user object as non-root. Jeremy. --- Summary of changes: source/rpc_server/srv_samr_nt.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c index e2cf8cd..0ab8b5d 100644 --- a/source/rpc_server/srv_samr_nt.c +++ b/source/rpc_server/srv_samr_nt.c @@ -2709,7 +2709,7 @@ NTSTATUS _samr_QueryUserInfo(pipes_struct *p, return NT_STATUS_INVALID_HANDLE; status = access_check_samr_function(info-acc_granted, - SA_RIGHT_DOMAIN_OPEN_ACCOUNT, + SAMR_USER_ACCESS_GET_ATTRIBUTES, _samr_QueryUserInfo); if (!NT_STATUS_IS_OK(status)) { return status; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - c4c6e1e463fe5ab8bb0e3e649d76ac5ec80900de
The branch, master has been updated via c4c6e1e463fe5ab8bb0e3e649d76ac5ec80900de (commit) from 1c6a87604f535f3e78f0798bb8b2a6408f2c93d9 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit c4c6e1e463fe5ab8bb0e3e649d76ac5ec80900de Author: Jeremy Allison [EMAIL PROTECTED] Date: Wed Dec 10 15:29:14 2008 -0800 Fix usrmgr opening a user object as non-root. Jeremy. --- Summary of changes: source3/rpc_server/srv_samr_nt.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 25bbc6e..f942476 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -2636,7 +2636,7 @@ NTSTATUS _samr_QueryUserInfo(pipes_struct *p, return NT_STATUS_INVALID_HANDLE; status = access_check_samr_function(info-acc_granted, - SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT, + SAMR_USER_ACCESS_GET_ATTRIBUTES, _samr_QueryUserInfo); if (!NT_STATUS_IS_OK(status)) { return status; -- Samba Shared Repository
Build status as of Thu Dec 11 00:00:02 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-12-10 00:00:13.0 + +++ /home/build/master/cache/broken_results.txt 2008-12-11 00:00:46.0 + @@ -1,4 +1,4 @@ -Build status as of Wed Dec 10 00:00:02 2008 +Build status as of Thu Dec 11 00:00:02 2008 Build counts: Tree Total Broken Panic @@ -14,9 +14,9 @@ rsync31 13 0 samba-docs 0 0 0 samba-gtk5 5 0 -samba_3_X_devel 27 20 1 -samba_3_X_test 27 19 0 -samba_4_0_test 30 30 7 +samba_3_X_devel 27 22 1 +samba_3_X_test 27 20 0 +samba_4_0_test 30 29 7 smb-build29 6 0 talloc 31 31 0 tdb 29 11 0
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4613-g11bd02b
The branch, v3-3-test has been updated via 11bd02bc8e1484a953632d3293db716da2647c04 (commit) from 6a4b0683e05ecc0bf57a1601c741582576f31b23 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 11bd02bc8e1484a953632d3293db716da2647c04 Author: Jeremy Allison [EMAIL PROTECTED] Date: Wed Dec 10 17:04:29 2008 -0800 Make the LookupRid access check match LookupName until we know the correct bits to use here. Jeremy. --- Summary of changes: source/rpc_server/srv_samr_nt.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c index 4ee3ed6..f3d0e1b 100644 --- a/source/rpc_server/srv_samr_nt.c +++ b/source/rpc_server/srv_samr_nt.c @@ -2131,7 +2131,7 @@ NTSTATUS _samr_LookupRids(pipes_struct *p, return NT_STATUS_INVALID_HANDLE; status = access_check_samr_function(acc_granted, - SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS, + 0, /* Don't know the acc_bits yet */ _samr_LookupRids); if (!NT_STATUS_IS_OK(status)) { return status; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3258-g1497c69
The branch, v3-2-test has been updated via 1497c6964767d6d73d6c1c1f6bbbeff2f05b35bc (commit) from 239a2d0ac6f1b56d67d7fffdb7388a3008eeb4e2 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 1497c6964767d6d73d6c1c1f6bbbeff2f05b35bc Author: Jeremy Allison [EMAIL PROTECTED] Date: Wed Dec 10 17:04:45 2008 -0800 Make the LookupRid access check match LookupName until we know the correct bits to use here. Jeremy. --- Summary of changes: source/rpc_server/srv_samr_nt.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c index 0ab8b5d..6b1d465 100644 --- a/source/rpc_server/srv_samr_nt.c +++ b/source/rpc_server/srv_samr_nt.c @@ -2130,7 +2130,7 @@ NTSTATUS _samr_LookupRids(pipes_struct *p, return NT_STATUS_INVALID_HANDLE; status = access_check_samr_function(acc_granted, - SA_RIGHT_DOMAIN_ENUM_ACCOUNTS, + 0, /* Don't know the acc_bits yet */ _samr__LookupRids); if (!NT_STATUS_IS_OK(status)) { return status; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - d7d525bc9d8bf2f3dffbbc568254c3e774944268
The branch, master has been updated via d7d525bc9d8bf2f3dffbbc568254c3e774944268 (commit) from c4c6e1e463fe5ab8bb0e3e649d76ac5ec80900de (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit d7d525bc9d8bf2f3dffbbc568254c3e774944268 Author: Jeremy Allison [EMAIL PROTECTED] Date: Wed Dec 10 17:03:53 2008 -0800 Make the LookupRid access check match LookupName until we know the correct bits to use here. Jeremy. --- Summary of changes: source3/rpc_server/srv_samr_nt.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index f942476..342f432 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -2079,7 +2079,7 @@ NTSTATUS _samr_LookupRids(pipes_struct *p, return NT_STATUS_INVALID_HANDLE; status = access_check_samr_function(acc_granted, - SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS, + 0, /* Don't know the acc_bits yet */ _samr_LookupRids); if (!NT_STATUS_IS_OK(status)) { return status; -- Samba Shared Repository