[SCM] Samba Shared Repository - branch v3-3-stable updated -
release-3-3-3-33-gdd02789
Karolin Seeger
kseeger at samba.org
Fri Apr 17 11:03:37 GMT 2009
The branch, v3-3-stable has been updated
via dd02789ce82b2ed7e60a2168e1b0bcb6656d0ce6 (commit)
via ae7c1b59f0c537f0e3a689150fcab8040301fd5c (commit)
via 016d6e8a077d35752448bc833ee67aa7bc886aba (commit)
via 26c73280654efc1320bcfe1808ebf545d43b4487 (commit)
via 40ec3c6ea77248a4d39a7f7322d9bebc41b832c8 (commit)
via a2469fe6b04881a257e5f5c255e83c9cf50c19d4 (commit)
via a7b1a75ba334fcde71da0a70a4ed7e007996ee17 (commit)
via bb7c209b2728aa51e1660e40952510ff914bcb88 (commit)
via 8bb93e555842c51a3722c46bcc8401f3944b1b3d (commit)
via aec3cf3e0e4b4d6c30c88cd46d8114c8750c448b (commit)
via 38ba3af879fdbca736233da45608fdaca0add9f5 (commit)
via 77bc996c769a253d0fa07cd9808162372dfc73c9 (commit)
via 8a74aeb1b0fc42687adede34bfc131d486b8873b (commit)
via 892ffce717cf1e0ad9eed2d9ebcc4df88b58f3d8 (commit)
via 54c13a6c226a6a06e64180d2fbdd29cba8fcf483 (commit)
via 26d176b0019f656b9b603e670fbac2257504f432 (commit)
via 9d5069129123c5e5f738cc0dbe49c6cadbfd4023 (commit)
via 269799d33e06910397e407fefe7a6e84a39ac2e0 (commit)
via 5e6efe9632842815dfcdcb61e3289b5ae70485c9 (commit)
via e2a5386e34e2c8210e615e9d860eb6f22ea6043b (commit)
via 243fd31f6d17b192cac2f12bbe6e5fa99d3b6c9a (commit)
via 8b3c6220fea7d691ee0bd0c8c211624a0379ef6f (commit)
via cb5a5728cc36a2232bcedb0cf64b7bdf14d7a06f (commit)
via 5372102f37c5e6da2837426d64047957bc54a905 (commit)
via 4190dbe13bf473ba7b8aea8503145d38e77abaea (commit)
via f780afd9754181104e986eff48498925b45c0344 (commit)
via 9159045951d33ae0f3e7b355a1ade5aabb0dbf72 (commit)
via 9ff316ea2fb927d46878cdae4d9fa0d7a3e9fe77 (commit)
via 5094f0b593741bf6a62122390d46539d5136f1a2 (commit)
via 7da73d74880a3ba2bf529bc9ce8fc681887ac50c (commit)
via 93aff1c36b94eb7f4912077bf42d04e37da0cf89 (commit)
via ce241b6a6cf5f11e74fac3676b49dbf3564a614e (commit)
via eecd4e74c5777ba6e15f67fea53c897b195150cc (commit)
from ac2d88014dd7d2c09480972ab4e950cfec62b6cc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable
- Log -----------------------------------------------------------------
commit dd02789ce82b2ed7e60a2168e1b0bcb6656d0ce6
Author: Günther Deschner <gd at samba.org>
Date: Fri Apr 17 01:30:54 2009 +0200
s3-docs: fix typo in smb.conf.5.
Guenther
(cherry picked from commit 05ea8daacabe62b6c20770a8518192c44e7eb763)
(cherry picked from commit 8dc31b185d67aa4cdcb367254a913039e3f286ee)
commit ae7c1b59f0c537f0e3a689150fcab8040301fd5c
Author: Günther Deschner <gd at samba.org>
Date: Thu Apr 16 13:03:35 2009 +0200
s3-docs: document warn_pwd_expire pam_winbind option in manpage.
Andreas, please check.
Guenther
(cherry picked from commit 5517c0bcddfbd8c877fd1f909407824553a20e7f)
(cherry picked from commit 1f5485ed8d8e50159859b2e994680dfa224d15f3)
commit 016d6e8a077d35752448bc833ee67aa7bc886aba
Author: Jeremy Allison <jra at samba.org>
Date: Thu Apr 16 16:21:00 2009 -0700
Add torture tester to ensure we don't regress the ulogoff bug.
Jeremy.
(cherry picked from commit e2dd445921b509a2c05646e5aece50243f2b7a5a)
commit 26c73280654efc1320bcfe1808ebf545d43b4487
Author: Jeremy Allison <jra at samba.org>
Date: Thu Apr 16 16:20:12 2009 -0700
Fix bug found by Tim Prouty, logging off and then re-using a vuid can cause smbd to
access a freed structure.
Jeremy.
(cherry picked from commit 043ade0f4dff788f81e014d3c85217377226899e)
commit 40ec3c6ea77248a4d39a7f7322d9bebc41b832c8
Author: Jeremy Allison <jra at samba.org>
Date: Thu Apr 16 15:14:37 2009 -0700
When doing a cli_ulogoff don't invalidate the cnum, invalidate the vuid.
Jeremy.
(cherry picked from commit d7b0894c8d025ceda4b7208e134e591bc4953400)
commit a2469fe6b04881a257e5f5c255e83c9cf50c19d4
Author: Jim McDonough <jmcd at samba.org>
Date: Thu Apr 16 17:04:00 2009 +0200
Don't look up local user for remote changes, even when root.
(cherry picked from commit bece9b36c455de30eb601912554d43e743def6b2)
commit a7b1a75ba334fcde71da0a70a4ed7e007996ee17
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Apr 16 10:25:29 2009 +1000
In net_conf_import, start a transaction when importing a single share.
Commit d69c3db9d44ad5d9fd1f5d7a9499f3bd79ecfb47 caused the transaction
start to be conditional but the commit is still unconditional, so an
error occurs when importing a single share.
An alternate fix would be to return the transaction start to be
unconditional but then it would occur before other error checking.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 9a28b28314c6a76cf619fc5f1b676d1f4229e3e1)
commit bb7c209b2728aa51e1660e40952510ff914bcb88
Author: Günther Deschner <gd at samba.org>
Date: Thu Apr 16 01:42:35 2009 +0200
s3-lsa: Fix Bug #6263. Unexpected LookupSids reply crashes XP pre-SP3.
LookupSids needs to bounce back string sids in case of NT_STATUS_NONE_MAPPED.
Guenther
(cherry picked from commit 597be402e40ff880b595ae49a8600b932365cbcb)
commit 8bb93e555842c51a3722c46bcc8401f3944b1b3d
Author: Jeremy Allison <jra at samba.org>
Date: Wed Apr 15 14:31:43 2009 -0700
Fix bug #6089 - Winbind samr_OpenDomain not possible with Samba 3.2.6+
What a difference a name makes... :-). Just because something is missnamed
SA_RIGHT_SAM_OPEN_DOMAIN, when it should actually be SA_RIGHT_SAM_LOOKUP_DOMAIN,
don't automatically use it for a security check in _samr_OpenDomain().
Jeremy.
(cherry picked from commit 8a985bcfe4aee7e602601fe78a94757dce645fcc)
commit aec3cf3e0e4b4d6c30c88cd46d8114c8750c448b
Author: Günther Deschner <gd at samba.org>
Date: Tue Apr 14 22:39:36 2009 +0200
netdomjoin-gui: make sure to grey out change fields when not running as root.
Guenther
(cherry picked from commit ca3de0103b545c86c8507dfc7d042f1838d5dfb2)
(cherry picked from commit cb96e70a1d9112d9e4fff1fda4cf64abc7985347)
(cherry picked from commit 64c0c6cfc6d44a9bb8ea13e56ed6c3d1eee3861e)
commit 38ba3af879fdbca736233da45608fdaca0add9f5
Author: Guenther Deschner <gd at samba.org>
Date: Mon Apr 13 09:44:54 2009 -0700
s3-loadparm: Fix resume command typo for "printing = vlp".
(cherry picked from commit f3ec61a77973781ca1f39c345d5e03a9ba9e43ae)
commit 77bc996c769a253d0fa07cd9808162372dfc73c9
Author: Volker Lendecke <vl at samba.org>
Date: Sat Apr 11 13:54:06 2009 -0700
Fix a memleak in an unlikely error path in change_notify_create()
(cherry picked from commit 42a2678c2f78b3c9ff59c57eb8132fd3698b5710)
commit 8a74aeb1b0fc42687adede34bfc131d486b8873b
Author: Jeremy Allison <jra at samba.org>
Date: Thu Apr 9 22:46:31 2009 -0700
Fix bug #6254 - PUT/GET produces an error in IPv6 to a smb-server(3.3)
has parameter "msdfs root = yes"
This was broken by the refactoring around create_file().
MSDFS pathname processing must be done FIRST.
MSDFS pathnames containing IPv6 addresses can
be confused with NTFS stream names (they contain
":" characters.
Jeremy.
(cherry picked from commit f63751ad272b9caade7855665b8a3352cefe2ae7)
commit 892ffce717cf1e0ad9eed2d9ebcc4df88b58f3d8
Author: Günther Deschner <gd at samba.org>
Date: Wed Apr 8 22:48:41 2009 +0200
error-codes: add some service related error codes.
Guenther
(cherry picked from commit a46f334c73683276984727a7306b18d2d2a8e222)
commit 54c13a6c226a6a06e64180d2fbdd29cba8fcf483
Author: Günther Deschner <gd at samba.org>
Date: Wed Apr 8 21:45:04 2009 +0200
s3-net: Fix Bug #5329: add "net rpc service delete/create".
Patch from Danny Tylman <danny.tylman at insightix.com>.
Guenther
(cherry picked from commit d0c307af56006d6fb898e395613d7e9c29b84116)
(cherry picked from commit 86c360134d9a282d0955f0fd18c0d3727d010f57)
commit 26d176b0019f656b9b603e670fbac2257504f432
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Apr 8 17:49:21 2009 +0200
s3/packaging: Add idmap_hash and idmap_adex to the list of built modules.
Karolin
(cherry picked from commit bed4f8413435c39e37ea04940a18ee78481db48f)
(cherry picked from commit c005bd724062273586ed9e3373826ed42ec396ce)
(cherry picked from commit abef0fb2ab98987da3bb15062c014fa35f4ce196)
commit 9d5069129123c5e5f738cc0dbe49c6cadbfd4023
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Apr 7 20:01:27 2009 +0200
s3/popt.h: Fix typo.
This used to be commit 8da2fa36 in master.
Karolin
(cherry picked from commit 3df28fce45ce552df2c0815597fc1808ea08b363)
commit 269799d33e06910397e407fefe7a6e84a39ac2e0
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Apr 7 20:00:47 2009 +0200
s3/loadparm: Fiy typos.
This used to be commit 44588095 in master.
Karolin
(cherry picked from commit 7648c51afaf844e576935dadc0d66a94e2cad28b)
commit 5e6efe9632842815dfcdcb61e3289b5ae70485c9
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Apr 7 19:58:47 2009 +0200
s3/gpo_ldap: Fix typo.
This used to be commit a103222e in master.
Karolin
(cherry picked from commit a33677c8a80925965a4023785fc3a221d2ed9585)
commit e2a5386e34e2c8210e615e9d860eb6f22ea6043b
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Apr 7 19:58:14 2009 +0200
s3/smbconf_reg: Fix typo.
This used to be commit 6343cab3 in master.
Karolin
(cherry picked from commit 56e877662dd6da64b348803c24e85f60ee6b3d85)
commit 243fd31f6d17b192cac2f12bbe6e5fa99d3b6c9a
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Apr 7 19:55:45 2009 +0200
s3/docs: Fix typo.
Karolin
(cherry picked from commit c002c1d776bc62bafe62e29a91e05100c5025890)
(cherry picked from commit 0b1a17739c8295642b8697cba3d3907238ad935d)
commit 8b3c6220fea7d691ee0bd0c8c211624a0379ef6f
Author: Volker Lendecke <vl at samba.org>
Date: Sun Apr 5 07:32:03 2009 +0200
Make some functions static to vfs_gpfs.c
(cherry picked from commit 8950b5acfcae187f73549c62e63fdc97c5764419)
commit cb5a5728cc36a2232bcedb0cf64b7bdf14d7a06f
Author: Volker Lendecke <vl at samba.org>
Date: Sun Apr 5 07:31:30 2009 +0200
Fix two c++ warnings in vfs_gpfs.c
(cherry picked from commit 5269ea017c1a266ed7e0fb2af2e3df0d02124202)
commit 5372102f37c5e6da2837426d64047957bc54a905
Author: Günther Deschner <gd at samba.org>
Date: Mon Apr 6 12:45:46 2009 +0200
s3-examples: Fix Bug #6205. Correct sample smb.conf share configuration.
Thanks to Jeffrey Riaboy <dakusan at castledragmire.com>.
Guenther
(cherry picked from commit 2b1fe2c98f4e0013dee4cbae62dc36cdd4085c7d)
(cherry picked from commit 5d9844f0d08419aea63c2f6d82a7c78f220541ff)
commit 4190dbe13bf473ba7b8aea8503145d38e77abaea
Author: Volker Lendecke <vl at samba.org>
Date: Sat Mar 28 19:58:45 2009 +0100
Fix smbd crash for close_on_completion
handle_trans() can talloc_free "conn" if the client requests
close_on_completion. "state" is a talloc_child of conn, so it will be gone when
we later free state->data et al.
(cherry picked from commit 1b7e108cc50a35fa1c15cf4a46f970306efdd1a3)
commit f780afd9754181104e986eff48498925b45c0344
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 3 14:24:02 2009 -0700
Use cluster-aware procid_is_me instead of comparing pid's
(cherry picked from commit e2cd00813c5221a03508249e5bb49e648befc734)
commit 9159045951d33ae0f3e7b355a1ade5aabb0dbf72
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 3 14:03:43 2009 -0700
Use procid_str in debug messages for better cluster-debuggability
(cherry picked from commit 4955e1610af3086cc7e8d0344313a124b23a4e31)
commit 9ff316ea2fb927d46878cdae4d9fa0d7a3e9fe77
Author: Günther Deschner <gd at samba.org>
Date: Fri Apr 3 12:50:50 2009 +0200
s3-nsswitch: Fix Bug #6238 2nd part. zero blob pointer in wbcLogoffUserParams.
Patch from Rashid N. Achilov <citycat4 at ngs.ru>.
Guenther
(cherry picked from commit 43372b27403f617897bab564c42eead4d64532e4)
(cherry picked from commit 962a92024dda7db06d07d6e736d79d25c5d8f40a)
commit 5094f0b593741bf6a62122390d46539d5136f1a2
Author: Günther Deschner <gd at samba.org>
Date: Fri Apr 3 12:06:40 2009 +0200
s3-samr: try to to fix password_expired flag handling.
Guenther
(cherry picked from commit 3420ce3f2a9c75b3e339d2ab439f6c8df326ab47)
commit 7da73d74880a3ba2bf529bc9ce8fc681887ac50c
Author: Günther Deschner <gd at samba.org>
Date: Fri Apr 3 09:57:53 2009 +0200
s3-nsswitch: Fix Bug #6238. Make sure wbcLogoffUserParams are properly initialized before freed.
Fix inspired by patch from Rashid N. Achilov <citycat4 at ngs.ru>.
Guenther
(cherry picked from commit 09265bcff5a2fac42f5abf34b8b439aa0a6998a1)
(cherry picked from commit b737a6202cc18bfab091d5f45a3c30e97828e927)
commit 93aff1c36b94eb7f4912077bf42d04e37da0cf89
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 2 21:23:18 2009 +0200
Bug #6243. Fix usrmgr.exe creating a user.
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 612aabd85287e9049973d63d1234b1d2a743ccd8)
commit ce241b6a6cf5f11e74fac3676b49dbf3564a614e
Author: Jeremy Allison <jra at samba.org>
Date: Wed Apr 1 20:14:35 2009 -0700
Allow pdbedit to change a user rid/sid. Based on a fix from Alexander
Zagrebin <alexz at visp.ru>.
Jeremy.
(cherry picked from commit e3584e529ce0a697222ffdff842c3217464866b8)
commit eecd4e74c5777ba6e15f67fea53c897b195150cc
Author: Michael Adam <obnox at samba.org>
Date: Thu Apr 2 00:23:31 2009 +0200
s3:net conf: don't store share names as lower case, but as given.
Michael
(cherry picked from commit 2b634c6633904052eaca651b6d00f6cdb7457ef8)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/pam_winbind.7.xml | 9 +-
docs-xml/manpages-3/smbcontrol.1.xml | 2 +-
.../smbdotconf/winbind/winbindnormalizenames.xml | 2 +-
examples/smb.conf.default | 2 +-
packaging/RHEL/samba.spec.tmpl | 2 +-
source/include/doserr.h | 3 +
source/include/proto.h | 6 +
.../examples/netdomjoin-gui/netdomjoin-gui.c | 15 ++
source/lib/netapi/group.c | 18 +-
source/lib/netapi/localgroup.c | 25 ++--
source/lib/netapi/user.c | 30 ++--
source/lib/smbconf/smbconf_reg.c | 2 +-
source/libgpo/gpo_ldap.c | 2 +-
source/libnet/libnet_join.c | 2 +-
source/librpc/gen_ndr/ndr_samr.c | 2 +-
source/librpc/gen_ndr/samr.h | 4 +-
source/librpc/idl/samr.idl | 4 +-
source/librpc/idl/security.idl | 6 +-
source/libsmb/cliconnect.c | 2 +-
source/libsmb/doserr.c | 3 +
source/locking/brlock.c | 4 +-
source/modules/vfs_gpfs.c | 32 ++--
source/nsswitch/pam_winbind.c | 5 +-
source/param/loadparm.c | 6 +-
source/passdb/pdb_tdb.c | 60 ++++++-
source/popt/popt.h | 2 +-
source/rpc_server/srv_lsa_nt.c | 10 +-
source/rpc_server/srv_pipe.c | 3 +-
source/rpc_server/srv_samr_nt.c | 133 +++++++------
source/rpc_server/srv_samr_util.c | 87 ++++++++-
source/smbd/ipc.c | 4 +
source/smbd/notify.c | 1 +
source/smbd/open.c | 41 +++--
source/smbd/oplock.c | 28 ++--
source/smbd/uid.c | 11 +
source/torture/torture.c | 45 +++++
source/utils/net_conf.c | 30 ++-
source/utils/net_rpc.c | 2 +-
source/utils/net_rpc_join.c | 2 +-
source/utils/net_rpc_service.c | 204 ++++++++++++++++++++
source/utils/smbpasswd.c | 16 +-
41 files changed, 671 insertions(+), 196 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/pam_winbind.7.xml b/docs-xml/manpages-3/pam_winbind.7.xml
index 23fcafc..db402ea 100644
--- a/docs-xml/manpages-3/pam_winbind.7.xml
+++ b/docs-xml/manpages-3/pam_winbind.7.xml
@@ -142,8 +142,15 @@
</para></listitem>
</varlistentry>
- </variablelist>
+ <varlistentry>
+ <term>warn_pwd_expire</term>
+ <listitem><para>
+ Defines number of days before pam_winbind starts to warn about passwords that are
+ going to expire. Defaults to 14 days.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
</para>
diff --git a/docs-xml/manpages-3/smbcontrol.1.xml b/docs-xml/manpages-3/smbcontrol.1.xml
index 46dd660..d4bccb7 100644
--- a/docs-xml/manpages-3/smbcontrol.1.xml
+++ b/docs-xml/manpages-3/smbcontrol.1.xml
@@ -66,7 +66,7 @@
<para>The <parameter>all</parameter> destination causes the
message to "broadcast" to all running daemons including nmbd and
winbind. This is a change for Samba 3.3, prior to this the
- paramter smbd used to do this.</para>
+ parameter smbd used to do this.</para>
<para>The <parameter>smbd</parameter> destination causes the
message to be sent to the smbd daemon specified in the
diff --git a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
index 5b68bca..ba71686 100644
--- a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
@@ -16,7 +16,7 @@
</para>
<para>This feature also enables the name aliasing API which can
- be used to make domain user and group names to a non-qlaified
+ be used to make domain user and group names to a non-qualified
version. Please refer to the manpage for the configured
idmap and nss_info plugin for the specifics on how to configure
name aliasing for a specific configuration. Name aliasing takes
diff --git a/examples/smb.conf.default b/examples/smb.conf.default
index 971ca19..b4e3d63 100644
--- a/examples/smb.conf.default
+++ b/examples/smb.conf.default
@@ -204,7 +204,7 @@
; comment = Public Stuff
; path = /home/samba
; public = yes
-; writable = yes
+; writable = no
; printable = no
; write list = @staff
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 94794cc..d5e549b 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -157,7 +157,7 @@ CC="$CC" CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--without-smbwrapper \
--with-pam \
--with-quotas \
- --with-shared-modules=idmap_rid,idmap_ad \
+ --with-shared-modules=idmap_rid,idmap_ad,idmap_hash,idmap_adex \
--with-syslog \
--with-utmp \
--with-dnsupdate
diff --git a/source/include/doserr.h b/source/include/doserr.h
index 5d3b866..8abe5d2 100644
--- a/source/include/doserr.h
+++ b/source/include/doserr.h
@@ -201,7 +201,10 @@
#define WERR_INVALID_SERVICE_CONTROL W_ERROR(1052)
#define WERR_SERVICE_ALREADY_RUNNING W_ERROR(1056)
#define WERR_SERVICE_DISABLED W_ERROR(1058)
+#define WERR_SERVICE_MARKED_FOR_DELETE W_ERROR(1072)
+#define WERR_SERVICE_EXISTS W_ERROR(1073)
#define WERR_SERVICE_NEVER_STARTED W_ERROR(1077)
+#define WERR_DUPLICATE_SERVICE_NAME W_ERROR(1078)
#define WERR_NOT_FOUND W_ERROR(1168)
#define WERR_INVALID_COMPUTER_NAME W_ERROR(1210)
#define WERR_INVALID_DOMAINNAME W_ERROR(1212)
diff --git a/source/include/proto.h b/source/include/proto.h
index 794742c..ec8637b 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -8373,6 +8373,8 @@ ssize_t write_to_internal_pipe(struct pipes_struct *p, char *data, size_t n);
/* The following definitions come from rpc_server/srv_samr_util.c */
+void copy_id18_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo18 *from);
void copy_id20_to_sam_passwd(struct samu *to,
struct samr_UserInfo20 *from);
void copy_id21_to_sam_passwd(const char *log_prefix,
@@ -8380,8 +8382,12 @@ void copy_id21_to_sam_passwd(const char *log_prefix,
struct samr_UserInfo21 *from);
void copy_id23_to_sam_passwd(struct samu *to,
struct samr_UserInfo23 *from);
+void copy_id24_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo24 *from);
void copy_id25_to_sam_passwd(struct samu *to,
struct samr_UserInfo25 *from);
+void copy_id26_to_sam_passwd(struct samu *to,
+ struct samr_UserInfo26 *from);
/* The following definitions come from rpc_server/srv_spoolss.c */
diff --git a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
index 40a6e41..8164b74 100644
--- a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
+++ b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
@@ -78,6 +78,7 @@ typedef struct join_state {
gboolean hostname_changed;
uint32_t stored_num_ous;
char *target_hostname;
+ uid_t uid;
} join_state;
static void debug(const char *format, ...)
@@ -1440,6 +1441,10 @@ static int draw_main_window(struct join_state *state)
/* Entry */
entry = gtk_entry_new();
gtk_entry_set_max_length(GTK_ENTRY(entry), 256);
+
+ if (state->uid != 0) {
+ gtk_widget_set_sensitive(GTK_WIDGET(entry), FALSE);
+ }
g_signal_connect(G_OBJECT(entry), "changed",
G_CALLBACK(callback_enter_computer_description_and_unlock),
state);
@@ -1526,6 +1531,9 @@ static int draw_main_window(struct join_state *state)
G_CALLBACK(callback_do_change),
(gpointer)state);
gtk_box_pack_start(GTK_BOX(bbox), button, TRUE, TRUE, 0);
+ if (state->uid != 0) {
+ gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
+ }
gtk_widget_show(button);
/* Label (hidden) */
@@ -1533,6 +1541,11 @@ static int draw_main_window(struct join_state *state)
gtk_label_set_line_wrap(GTK_LABEL(state->label_reboot), TRUE);
gtk_misc_set_alignment(GTK_MISC(state->label_reboot), 0, 0);
gtk_box_pack_start(GTK_BOX(vbox), state->label_reboot, TRUE, TRUE, 0);
+ if (state->uid != 0) {
+ gtk_label_set_text(GTK_LABEL(state->label_reboot),
+ "You cannot change computer description as you're not running with root permissions");
+ }
+
gtk_widget_show(state->label_reboot);
#if 0
@@ -1763,6 +1776,8 @@ static int initialize_join_state(struct join_state *state,
return -1;
}
+ state->uid = geteuid();
+
state->ctx = ctx;
return 0;
diff --git a/source/lib/netapi/group.c b/source/lib/netapi/group.c
index b3bb14e..6dcf2e1 100644
--- a/source/lib/netapi/group.c
+++ b/source/lib/netapi/group.c
@@ -81,7 +81,7 @@ WERROR NetGroupAdd_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_CREATE_GROUP |
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
@@ -258,7 +258,7 @@ WERROR NetGroupDel_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
&domain_handle,
@@ -429,7 +429,7 @@ WERROR NetGroupSetInfo_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
&domain_handle,
@@ -670,7 +670,7 @@ WERROR NetGroupGetInfo_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
&domain_handle,
@@ -792,7 +792,7 @@ WERROR NetGroupAddUser_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
&domain_handle,
@@ -919,7 +919,7 @@ WERROR NetGroupDelUser_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
&domain_handle,
@@ -1203,7 +1203,7 @@ WERROR NetGroupEnum_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2 |
SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS |
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
@@ -1340,7 +1340,7 @@ WERROR NetGroupGetUsers_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
&domain_handle,
@@ -1498,7 +1498,7 @@ WERROR NetGroupSetUsers_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
&domain_handle,
diff --git a/source/lib/netapi/localgroup.c b/source/lib/netapi/localgroup.c
index 25a3427..d571045 100644
--- a/source/lib/netapi/localgroup.c
+++ b/source/lib/netapi/localgroup.c
@@ -159,7 +159,7 @@ WERROR NetLocalGroupAdd_r(struct libnetapi_ctx *ctx,
}
werr = libnetapi_samr_open_builtin_domain(ctx, pipe_cli,
- SAMR_ACCESS_OPEN_DOMAIN |
+ SAMR_ACCESS_LOOKUP_DOMAIN |
SAMR_ACCESS_ENUM_DOMAINS,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
@@ -184,7 +184,7 @@ WERROR NetLocalGroupAdd_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_CREATE_ALIAS |
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
@@ -285,7 +285,7 @@ WERROR NetLocalGroupDel_r(struct libnetapi_ctx *ctx,
}
werr = libnetapi_samr_open_builtin_domain(ctx, pipe_cli,
- SAMR_ACCESS_OPEN_DOMAIN |
+ SAMR_ACCESS_LOOKUP_DOMAIN |
SAMR_ACCESS_ENUM_DOMAINS,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
@@ -310,7 +310,7 @@ WERROR NetLocalGroupDel_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_CREATE_ALIAS |
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
@@ -463,7 +463,7 @@ WERROR NetLocalGroupGetInfo_r(struct libnetapi_ctx *ctx,
}
werr = libnetapi_samr_open_builtin_domain(ctx, pipe_cli,
- SAMR_ACCESS_OPEN_DOMAIN |
+ SAMR_ACCESS_LOOKUP_DOMAIN |
SAMR_ACCESS_ENUM_DOMAINS,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
@@ -488,7 +488,7 @@ WERROR NetLocalGroupGetInfo_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_CREATE_ALIAS |
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
@@ -640,7 +640,7 @@ WERROR NetLocalGroupSetInfo_r(struct libnetapi_ctx *ctx,
}
werr = libnetapi_samr_open_builtin_domain(ctx, pipe_cli,
- SAMR_ACCESS_OPEN_DOMAIN |
+ SAMR_ACCESS_LOOKUP_DOMAIN |
SAMR_ACCESS_ENUM_DOMAINS,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
@@ -667,7 +667,7 @@ WERROR NetLocalGroupSetInfo_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
&domain_handle,
@@ -788,7 +788,7 @@ WERROR NetLocalGroupEnum_r(struct libnetapi_ctx *ctx,
}
werr = libnetapi_samr_open_builtin_domain(ctx, pipe_cli,
- SAMR_ACCESS_OPEN_DOMAIN |
+ SAMR_ACCESS_LOOKUP_DOMAIN |
SAMR_ACCESS_ENUM_DOMAINS,
SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2 |
SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS |
@@ -800,7 +800,7 @@ WERROR NetLocalGroupEnum_r(struct libnetapi_ctx *ctx,
}
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
- SAMR_ACCESS_OPEN_DOMAIN |
+ SAMR_ACCESS_LOOKUP_DOMAIN |
SAMR_ACCESS_ENUM_DOMAINS,
SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2 |
SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS |
@@ -1101,7 +1101,7 @@ static WERROR NetLocalGroupModifyMembers_r(struct libnetapi_ctx *ctx,
}
werr = libnetapi_samr_open_builtin_domain(ctx, pipe_cli,
- SAMR_ACCESS_OPEN_DOMAIN |
+ SAMR_ACCESS_LOOKUP_DOMAIN |
SAMR_ACCESS_ENUM_DOMAINS,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
@@ -1131,7 +1131,7 @@ static WERROR NetLocalGroupModifyMembers_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
&domain_handle,
@@ -1355,4 +1355,3 @@ WERROR NetLocalGroupSetMembers_l(struct libnetapi_ctx *ctx,
{
LIBNETAPI_REDIRECT_TO_LOCALHOST(ctx, r, NetLocalGroupSetMembers);
}
-
diff --git a/source/lib/netapi/user.c b/source/lib/netapi/user.c
index 2c78f6f..bddd161 100644
--- a/source/lib/netapi/user.c
+++ b/source/lib/netapi/user.c
@@ -391,7 +391,7 @@ WERROR NetUserAdd_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1 |
SAMR_DOMAIN_ACCESS_CREATE_USER |
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
@@ -519,7 +519,7 @@ WERROR NetUserDel_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
&domain_handle,
@@ -1231,7 +1231,7 @@ WERROR NetUserEnum_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_builtin_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT |
SAMR_DOMAIN_ACCESS_LOOKUP_ALIAS,
&connect_handle,
@@ -1242,7 +1242,7 @@ WERROR NetUserEnum_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2 |
SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS |
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
@@ -1536,7 +1536,7 @@ WERROR NetQueryDisplayInformation_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2 |
SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS |
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
@@ -1668,7 +1668,7 @@ WERROR NetUserGetInfo_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
&domain_handle,
@@ -1679,7 +1679,7 @@ WERROR NetUserGetInfo_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_builtin_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT |
SAMR_DOMAIN_ACCESS_LOOKUP_ALIAS,
&connect_handle,
@@ -1826,7 +1826,7 @@ WERROR NetUserSetInfo_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1 |
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
@@ -1838,7 +1838,7 @@ WERROR NetUserSetInfo_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_builtin_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT |
SAMR_DOMAIN_ACCESS_LOOKUP_ALIAS,
&connect_handle,
@@ -2252,7 +2252,7 @@ WERROR NetUserModalsGet_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
access_mask,
&connect_handle,
&domain_handle,
@@ -2736,7 +2736,7 @@ WERROR NetUserModalsSet_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
access_mask,
&connect_handle,
&domain_handle,
@@ -2875,7 +2875,7 @@ WERROR NetUserGetGroups_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
&domain_handle,
@@ -3032,7 +3032,7 @@ WERROR NetUserSetGroups_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
&connect_handle,
&domain_handle,
@@ -3320,7 +3320,7 @@ WERROR NetUserGetLocalGroups_r(struct libnetapi_ctx *ctx,
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
- SAMR_ACCESS_OPEN_DOMAIN,
+ SAMR_ACCESS_LOOKUP_DOMAIN,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT |
SAMR_DOMAIN_ACCESS_LOOKUP_ALIAS,
&connect_handle,
--
Samba Shared Repository
More information about the samba-cvs
mailing list