[Samba] Re: TYPO: The Official Samba 3.2.x HOWTO and Reference Guide
Another bug(or typo) in TOSHARG-Install.xml Line 334 variablelist varlistentrytermnmbd/term listitempara indextermprimarysmbd/primary/indexterm nmbd? indextermprimarystarting samba/primarysecondarysmbd/secondary/indexterm nmbd? This daemon handles all name registration and resolution requests. It is the primary vehicle involved in network browsing. It handles all UDP-based protocols. The commandnmbd/command daemon should be the first command started as part of the Samba startup process. /para/listitem /varlistentry varlistentrytermsmbd/term listitempara indextermprimarynmbd/primary/indexterm smbd? indextermprimarystarting samba/primarysecondarynmbd/secondary/indexterm smbd? -- --- Oota Toshiya --- t-oota at dh.jp.nec.com NEC Computers Software Operations Unit Shiba,Minato,Tokyo Open Source Software Platform Development Division Japan,Earth,Solar system (samba-jp/ldap-jp Staff,mutt-j/samba-jp postmaster) -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Re: TYPO: The Official Samba 3.2.x HOWTO and Reference Guide
Hi, On Mon, May 25, 2009 at 03:47:29PM +0900, OPC oota wrote: Another bug(or typo) in TOSHARG-Install.xml Line 334 variablelist varlistentrytermnmbd/term listitempara indextermprimarysmbd/primary/indexterm nmbd? indextermprimarystarting samba/primarysecondarysmbd/secondary/indexterm nmbd? This daemon handles all name registration and resolution requests. It is the primary vehicle involved in network browsing. It handles all UDP-based protocols. The commandnmbd/command daemon should be the first command started as part of the Samba startup process. /para/listitem /varlistentry varlistentrytermsmbd/term listitempara indextermprimarynmbd/primary/indexterm smbd? indextermprimarystarting samba/primarysecondarynmbd/secondary/indexterm smbd? fix is upstream (commit f3df3836 in master, will be included in 3.3.5 and 3.2.12). Thanks for reporting! Karolin -- Samba http://www.samba.org SerNet http://www.sernet.de sambaXP http://www.sambaxp.org pgpq13ohubil0.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] samba samba two way trusts and winbind
Hi, after whole day hitting my head into wall I decided to ask advise from clever people: My aim is to have two way trusts between two samba domains 3.0.25 and 3.0.28 I did: net rpc trustdom add and establish on both domains. It did not went ok, but problem was with creating ldap accounts for domains. I created them manually. Now I have kind of working trusts: # net rpc trustdom list Password: Trusted domains list: SIMPLES-1-5-21-4169227953-3400459336-1793241584 none Trusting domains list: SIMPLES-1-5-21-4169227953-3400459336-1793241584 This is the same on both domains. Then I faced a problem, that when I try to access workstation from other domain it says I canot and samba logs were complaining that user sid and group sid do not match and samba cannot handle it. I found on google, that I must have winbind working in order to solve this. I installed winbind and on one domain it is working - I can get a list of foreign users with wbinfo -u, and it seems to solve my workstation browsing. But I cannot get it working on the other domain. these are wbinfo messages: # wbinfo -u Error looking up domain users # wbinfo -m Could not list trusted domains # wbinfo --all-domains # wbinfo --getdcname=SIMPLE Could not get dc name for SIMPLE # net lookup dc simple 192.168.62.22 This is what I get with winbindd -S -n -i Processing section [Finansai] adding IPC service added interface ip=192.168.62.21 bcast=192.168.62.255 nmask=255.255.255.0 added interface ip=127.0.0.1 bcast=127.255.255.255 nmask=255.0.0.0 added interface ip=192.168.62.21 bcast=192.168.62.255 nmask=255.255.255.0 added interface ip=127.0.0.1 bcast=127.255.255.255 nmask=255.0.0.0 Registered MSG_REQ_POOL_USAGE Registered MSG_REQ_DMALLOC_MARK and LOG_CHANGED initialize_winbindd_cache: clearing cache and re-creating with version number 1 Added domain REC S-1-5-21-4050335463-3799486674-3258589777 Added domain BUILTIN S-1-5-32 get_dc_list: preferred server list: , * fcntl_lock: lock failed at offset 0 count 1 op 6 type 0 (Resource temporarily unavailable) get_dc_list: preferred server list: , * fcntl_lock: lock failed at offset 0 count 1 op 6 type 0 (Resource temporarily unavailable) get_dc_list: preferred server list: , * fcntl_lock: lock failed at offset 0 count 1 op 6 type 0 (Resource temporarily unavailable) [12524]: list trusted domains rpc: trusted_domains winbindd_dual_list_trusted_domains: trusted_domains returned NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND Could not receive trustdoms get_dc_list: preferred server list: , * get_dc_list: preferred server list: , * fcntl_lock: lock failed at offset 0 count 1 op 6 type 0 (Resource temporarily unavailable) get_dc_list: preferred server list: , * fcntl_lock: lock failed at offset 0 count 1 op 6 type 0 (Resource temporarily unavailable) get_dc_list: preferred server list: , * fcntl_lock: lock failed at offset 0 count 1 op 6 type 0 (Resource temporarily unavailable) Any ideas? Maybe there is a procedure how to get samba samba trust working? Thanks a lot Liutauras -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba samba two way trusts and winbind
thanks François, On Mon, May 25, 2009 at 8:56 PM, François Legal de...@thom.fr.eu.org wrote: I did never setup 2 way trust, but had a hard time setting up a one way trust. As far as I remember, the first thing to verify (before establishing the trust relation), is to have winbind successfully enumerate the local DC users and groups. This implies you have to join the PDC to its own domain (yes, this kind of surprised me at that time, but it makes some sense). For you that would be SIMPLE PDC have to join the SIMPLE domain and REC PDC join the REC domain (net rpc join PDC -U...) joining to its own PDC surprises me too ... but I will try. You should also have winbind correctly configured and able to allocate uids/gids. Do you mean that winbind should also get info out of its own domain? At that point, you should have wbinfo -m, wbinfo -t, wbinfo -u and wbinfo -g return successfully and the correct information. Yes, this what I thought, but winbind is complaining that it cannot find PDC, but net lookup finds it correctly. François -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Samba Configuration
Maybe I'm missing this - but I'm having problems setting up some file shares that are limited to certain groups. I've done countless searches on setups and on the tree connnect failed error message, and just haven't found anything that solves my problem. I am able to create shares that are basically open to the public, but I know the security is all messed up. I have openLDAP set up, can log onto the Samba server, but when I try to set up the security, I just end up with smbclient //Ubuntu/Staff Enter mlb's password: Domain=[WORKGROUP] OS=[Unix] Server=[Samba 3.0.28a] tree connect failed: NT_STATUS_ACCESS_DENIED So I started working through the Samba checklist at http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/diagnosis.html Is there some place that walks through a file share setup. I want to create a share called Staff that's only accessible by members of that group. I need to know how to set that up across Linux (Ubuntu 8.04), openLDAP and Samba and also how to do the setup for Wndows clients. I would also like an easy method to turn this over to the folks - it's volunteer work for our local Boys and Girls Club. Thanks again! smbclient //Ubuntu/tmp Enter mlb's password: Domain=[WORKGROUP] OS=[Unix] Server=[Samba 3.0.28a] smb: \ -- Matt Burkhardt, M.Sci. Technology Management m...@imparisystems.com (301) 682-7901 502 Fairview Avenue Frederick, MD 21701 http://www.imparisystems.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba samba two way trusts and winbind
Great François, it worked somehow. I did net join on both domain controllers, then some restarting winbind and smbd and it worked suddenly. Actually I'm not sure if this solves my problem with browsing other domain workstations, but this is what i was struggling all the day. On Mon, May 25, 2009 at 10:24 PM, Liutauras Adomaitis liutauras.adomai...@gmail.com wrote: thanks François, On Mon, May 25, 2009 at 8:56 PM, François Legal de...@thom.fr.eu.org wrote: I did never setup 2 way trust, but had a hard time setting up a one way trust. As far as I remember, the first thing to verify (before establishing the trust relation), is to have winbind successfully enumerate the local DC users and groups. This implies you have to join the PDC to its own domain (yes, this kind of surprised me at that time, but it makes some sense). For you that would be SIMPLE PDC have to join the SIMPLE domain and REC PDC join the REC domain (net rpc join PDC -U...) joining to its own PDC surprises me too ... but I will try. You should also have winbind correctly configured and able to allocate uids/gids. Do you mean that winbind should also get info out of its own domain? At that point, you should have wbinfo -m, wbinfo -t, wbinfo -u and wbinfo -g return successfully and the correct information. Yes, this what I thought, but winbind is complaining that it cannot find PDC, but net lookup finds it correctly. François -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba Configuration
On Mon, May 25, 2009 at 10:29 PM, Matt Burkhardt m...@imparisystems.com wrote: Maybe I'm missing this - but I'm having problems setting up some file shares that are limited to certain groups. I've done countless searches on setups and on the tree connnect failed error message, and just haven't found anything that solves my problem. I am able to create shares that are basically open to the public, but I know the security is all messed up. I have openLDAP set up, can log onto the Samba server, but when I try to set up the security, I just end up with smbclient //Ubuntu/Staff Enter mlb's password: Domain=[WORKGROUP] OS=[Unix] Server=[Samba 3.0.28a] tree connect failed: NT_STATUS_ACCESS_DENIED I think there is a number of possible answers or potential problems. your smb.conf, logs (level 10 it is not necessary probably, but 3 atleast - I think) is needed. Liutauras -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[SCM] CTDB repository - branch master updated - ctdb-1.0.82-25-g3e49e41
The branch, master has been updated
via 3e49e41c21eb8c53084aa8cc7fd3557bdd8eb7b6 (commit)
via 87292029cb444ffab130ff7dae47a629c2d15787 (commit)
via 9762a3408f10409b629637d237ec513a825a6059 (commit)
via f1c6f7dd47bb1081781c0a0d567a92bbbc0aa5d5 (commit)
from dca41ec04788922ce5f4c52d346872b3e35f8cbb (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 3e49e41c21eb8c53084aa8cc7fd3557bdd8eb7b6
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Mon May 25 17:04:42 2009 +1000
New attempt at TDB transaction nesting allow/disallow.
Make the default be that transaction is not allowed and any attempt to
create a nested transaction will fail with TDB_ERR_NESTING.
If an application can cope with transaction nesting and the implicit
semantics of tdb_transaction_commit(), it can enable transaction nesting
by using the TDB_ALLOW_NESTING flag.
commit 87292029cb444ffab130ff7dae47a629c2d15787
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Mon May 25 16:55:27 2009 +1000
Revert we only need to have transaction nesting disabled when we start the
new transaction for the recovery
This reverts commit bf8dae63d10498e6b6179bbacdd72f1ff0fc60be.
commit 9762a3408f10409b629637d237ec513a825a6059
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Mon May 25 16:55:02 2009 +1000
Revert set the TDB_NO_NESTING flag for the tdb before we start a
transaction from within recovery
This reverts commit 1b2029dbb055ff07367ebc1f307f5241320227b2.
commit f1c6f7dd47bb1081781c0a0d567a92bbbc0aa5d5
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Mon May 25 16:54:25 2009 +1000
Revert add TDB_NO_NESTING. When this flag is set tdb will not allow any
nested transactions and tdb_transaction_start() will implicitely _cancel() any
pending transactions before starting any new ones.
This reverts commit 459e4ee135bd1cd24c15e5325906eb4ecfd550ec.
---
Summary of changes:
lib/tdb/common/transaction.c | 25 +
lib/tdb/include/tdb.h|5 +++--
server/ctdb_freeze.c |2 --
3 files changed, 16 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdb/common/transaction.c b/lib/tdb/common/transaction.c
index 6a34c45..98e8eff 100644
--- a/lib/tdb/common/transaction.c
+++ b/lib/tdb/common/transaction.c
@@ -85,11 +85,13 @@
still available, but no transaction recovery area is used and no
fsync/msync calls are made.
- - if TDB_NO_NESTING is passed to flags in tdb open then transaction
-nesting is disabled. tdb_transaction_start() will then implicitely
-cancel any pending transactions and always start a new transaction
-context instead of nesting.
+ - if TDB_ALLOW_NESTING is passed to flags in tdb open, or added using
+tdb_add_flags() transaction is enabled.
+The default is that transaction nesting is not allowed and an attempt
+to create a nested transaction will fail with TDB_ERR_NESTING.
+Beware. when transactions are nested a transaction successfully
+completed with tdb_transaction_commit() can be silently unrolled later.
*/
@@ -414,15 +416,14 @@ int tdb_transaction_start(struct tdb_context *tdb)
/* cope with nested tdb_transaction_start() calls */
if (tdb-transaction != NULL) {
- if (!tdb-flags TDB_NO_NESTING) {
- tdb-transaction-nesting++;
- TDB_LOG((tdb, TDB_DEBUG_TRACE, tdb_transaction_start:
nesting %d\n,
-tdb-transaction-nesting));
- return 0;
- } else {
- tdb_transaction_cancel(tdb);
- TDB_LOG((tdb, TDB_DEBUG_TRACE, tdb_transaction_start:
cancelling previous transaction\n));
+ if (!(tdb-flags TDB_ALLOW_NESTING)) {
+ tdb-ecode = TDB_ERR_NESTING;
+ return -1;
}
+ tdb-transaction-nesting++;
+ TDB_LOG((tdb, TDB_DEBUG_TRACE, tdb_transaction_start: nesting
%d\n,
+tdb-transaction-nesting));
+ return 0;
}
if (tdb-num_locks != 0 || tdb-global_lock.count) {
diff --git a/lib/tdb/include/tdb.h b/lib/tdb/include/tdb.h
index 6281181..e678a7f 100644
--- a/lib/tdb/include/tdb.h
+++ b/lib/tdb/include/tdb.h
@@ -47,14 +47,15 @@ extern C {
#define TDB_NOSYNC 64 /* don't use synchronous transactions */
#define TDB_SEQNUM 128 /* maintain a sequence number */
#define TDB_VOLATILE 256 /* Activate the per-hashchain freelist, default 5 */
-#define TDB_NO_NESTING 512 /* Dont allow transaction nesting */
+#define TDB_ALLOW_NESTING 512 /* Allow transactions to nest */
#define TDB_ERRCODE(code,
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1769-gf3df383
The branch, master has been updated via f3df38362cc15211d9fca8229a0f9d9fc9c8e481 (commit) from b335618d1743599588902cfd2be4ae37150b239d (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f3df38362cc15211d9fca8229a0f9d9fc9c8e481 Author: Karolin Seeger ksee...@samba.org Date: Mon May 25 10:50:23 2009 +0200 s3/docs: Fix typos. Thanks to Oota Toshiya t-oota at dh.jp.nec.com for reporting! Karolin --- Summary of changes: docs-xml/Samba3-HOWTO/TOSHARG-Install.xml |8 1 files changed, 4 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml index c0ffc05..d13f6ee 100644 --- a/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml +++ b/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml @@ -334,8 +334,8 @@ variablelist varlistentrytermnmbd/term listitempara - indextermprimarysmbd/primary/indexterm - indextermprimarystarting samba/primarysecondarysmbd/secondary/indexterm + indextermprimarynmbd/primary/indexterm + indextermprimarystarting samba/primarysecondarynmbd/secondary/indexterm This daemon handles all name registration and resolution requests. It is the primary vehicle involved in network browsing. It handles all UDP-based protocols. The commandnmbd/command daemon should be the first command started as part of the Samba startup process. @@ -344,8 +344,8 @@ varlistentrytermsmbd/term listitempara - indextermprimarynmbd/primary/indexterm - indextermprimarystarting samba/primarysecondarynmbd/secondary/indexterm + indextermprimarysmbd/primary/indexterm + indextermprimarystarting samba/primarysecondarysmbd/secondary/indexterm This daemon handles all TCP/IP-based connection services for file- and print-based operations. It also manages local authentication. It should be started immediately following the startup of commandnmbd/command. /para/listitem -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5272-g7434898
The branch, v3-3-test has been updated via 7434898b10a5c5780bd015b7bdca3eaa7a2b5475 (commit) from fda54237e8a4a87086a670499273c1402d1cd02b (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 7434898b10a5c5780bd015b7bdca3eaa7a2b5475 Author: Karolin Seeger ksee...@samba.org Date: Mon May 25 10:50:23 2009 +0200 s3/docs: Fix typos. Thanks to Oota Toshiya t-oota at dh.jp.nec.com for reporting! Karolin (cherry picked from commit f3df38362cc15211d9fca8229a0f9d9fc9c8e481) --- Summary of changes: docs-xml/Samba3-HOWTO/TOSHARG-Install.xml |8 1 files changed, 4 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml index c0ffc05..d13f6ee 100644 --- a/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml +++ b/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml @@ -334,8 +334,8 @@ variablelist varlistentrytermnmbd/term listitempara - indextermprimarysmbd/primary/indexterm - indextermprimarystarting samba/primarysecondarysmbd/secondary/indexterm + indextermprimarynmbd/primary/indexterm + indextermprimarystarting samba/primarysecondarynmbd/secondary/indexterm This daemon handles all name registration and resolution requests. It is the primary vehicle involved in network browsing. It handles all UDP-based protocols. The commandnmbd/command daemon should be the first command started as part of the Samba startup process. @@ -344,8 +344,8 @@ varlistentrytermsmbd/term listitempara - indextermprimarynmbd/primary/indexterm - indextermprimarystarting samba/primarysecondarynmbd/secondary/indexterm + indextermprimarysmbd/primary/indexterm + indextermprimarystarting samba/primarysecondarysmbd/secondary/indexterm This daemon handles all TCP/IP-based connection services for file- and print-based operations. It also manages local authentication. It should be started immediately following the startup of commandnmbd/command. /para/listitem -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3591-g58372ab
The branch, v3-2-test has been updated via 58372ab5dccce60b40e29196767b29e81dfe9872 (commit) from fad2741ec79a34f25577d0a5d3c35a6455d3ce24 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 58372ab5dccce60b40e29196767b29e81dfe9872 Author: Karolin Seeger ksee...@samba.org Date: Mon May 25 10:50:23 2009 +0200 s3/docs: Fix typos. Thanks to Oota Toshiya t-oota at dh.jp.nec.com for reporting! Karolin (cherry picked from commit f3df38362cc15211d9fca8229a0f9d9fc9c8e481) (cherry picked from commit 7434898b10a5c5780bd015b7bdca3eaa7a2b5475) --- Summary of changes: docs-xml/Samba3-HOWTO/TOSHARG-Install.xml |8 1 files changed, 4 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml index c0ffc05..d13f6ee 100644 --- a/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml +++ b/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml @@ -334,8 +334,8 @@ variablelist varlistentrytermnmbd/term listitempara - indextermprimarysmbd/primary/indexterm - indextermprimarystarting samba/primarysecondarysmbd/secondary/indexterm + indextermprimarynmbd/primary/indexterm + indextermprimarystarting samba/primarysecondarynmbd/secondary/indexterm This daemon handles all name registration and resolution requests. It is the primary vehicle involved in network browsing. It handles all UDP-based protocols. The commandnmbd/command daemon should be the first command started as part of the Samba startup process. @@ -344,8 +344,8 @@ varlistentrytermsmbd/term listitempara - indextermprimarynmbd/primary/indexterm - indextermprimarystarting samba/primarysecondarynmbd/secondary/indexterm + indextermprimarysmbd/primary/indexterm + indextermprimarystarting samba/primarysecondarysmbd/secondary/indexterm This daemon handles all TCP/IP-based connection services for file- and print-based operations. It also manages local authentication. It should be started immediately following the startup of commandnmbd/command. /para/listitem -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1770-g2d689ad
The branch, master has been updated via 2d689ad9fc6ff86c70db24c5d57429ddfd0a948e (commit) from f3df38362cc15211d9fca8229a0f9d9fc9c8e481 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2d689ad9fc6ff86c70db24c5d57429ddfd0a948e Author: Volker Lendecke v...@samba.org Date: Mon May 25 12:36:30 2009 +0200 Attempt to fix a debian build problem --- Summary of changes: source3/Makefile.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index 1ad1f5a..30bfb4b 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -2151,7 +2151,7 @@ $(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LI @echo Linking shared library $@ @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) \ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBS) \ - $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ + $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) \ @sonamef...@`basename $...@` $(LIBSMBCLIENT_SHARED_TARGET): $(LIBSMBCLIENT_SHARED_TARGET_SONAME) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1055-g31eec30
The branch, v3-4-test has been updated via 31eec30c33b300d93f6d6895f6d0e6b06e0c2185 (commit) from bfeab3a0f621dbea50f43c98ba70b0ccd8323bff (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 31eec30c33b300d93f6d6895f6d0e6b06e0c2185 Author: Volker Lendecke v...@samba.org Date: Mon May 25 12:36:30 2009 +0200 Attempt to fix a debian build problem --- Summary of changes: source3/Makefile.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index 1bdc790..4001eda 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -2130,7 +2130,7 @@ $(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LI @echo Linking shared library $@ @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) \ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBS) \ - $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ + $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) \ @sonamef...@`basename $...@` $(LIBSMBCLIENT_SHARED_TARGET): $(LIBSMBCLIENT_SHARED_TARGET_SONAME) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1772-g1950e18
The branch, master has been updated
via 1950e180caf707346300b83021624d586cc3776d (commit)
via 86d087fccc30a82cb1fe3a71d0353634496e72c4 (commit)
from 2d689ad9fc6ff86c70db24c5d57429ddfd0a948e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1950e180caf707346300b83021624d586cc3776d
Author: Günther Deschner g...@samba.org
Date: Fri May 22 17:56:37 2009 +0200
s3-pamsmbpass: copy _pam_get_item and _pam_get_data from pam_winbind.
Guenther
commit 86d087fccc30a82cb1fe3a71d0353634496e72c4
Author: Günther Deschner g...@samba.org
Date: Fri May 22 16:48:01 2009 +0200
s3-rpcclient: use get_domain_handle() fn in enum domain users groups.
Guenther
---
Summary of changes:
source3/pam_smbpass/pam_smb_auth.c |4 +-
source3/pam_smbpass/pam_smb_passwd.c |8 +++---
source3/pam_smbpass/support.c| 38 +
source3/pam_smbpass/support.h|7 ++
source3/rpcclient/cmd_samr.c | 22 +--
5 files changed, 52 insertions(+), 27 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/pam_smbpass/pam_smb_auth.c
b/source3/pam_smbpass/pam_smb_auth.c
index 3dceb52..b5a6a47 100644
--- a/source3/pam_smbpass/pam_smb_auth.c
+++ b/source3/pam_smbpass/pam_smb_auth.c
@@ -179,7 +179,7 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags,
retval = PAM_SUCCESS;
- pam_get_data(pamh, smb_setcred_return, (const void **) pretval);
+ _pam_get_data(pamh, smb_setcred_return, pretval);
if(pretval) {
retval = *pretval;
SAFE_FREE(pretval);
@@ -199,7 +199,7 @@ static int _smb_add_user(pam_handle_t *pamh, unsigned int
ctrl,
int retval;
/* Get the authtok; if we don't have one, silently fail. */
- retval = pam_get_item( pamh, PAM_AUTHTOK, (const void **) pass );
+ retval = _pam_get_item( pamh, PAM_AUTHTOK, pass );
if (retval != PAM_SUCCESS) {
_log_err( LOG_ALERT
diff --git a/source3/pam_smbpass/pam_smb_passwd.c
b/source3/pam_smbpass/pam_smb_passwd.c
index b6de43f..dce6e01 100644
--- a/source3/pam_smbpass/pam_smb_passwd.c
+++ b/source3/pam_smbpass/pam_smb_passwd.c
@@ -229,11 +229,11 @@ int pam_sm_chauthtok(pam_handle_t *pamh, int flags,
*/
if (off( SMB_NOT_SET_PASS, ctrl )) {
-retval = pam_get_item( pamh, PAM_OLDAUTHTOK,
- (const void **)pass_old );
+retval = _pam_get_item( pamh, PAM_OLDAUTHTOK,
+ pass_old );
} else {
-retval = pam_get_data( pamh, _SMB_OLD_AUTHTOK,
- (const void **)pass_old );
+retval = _pam_get_data( pamh, _SMB_OLD_AUTHTOK,
+ pass_old );
if (retval == PAM_NO_MODULE_DATA) {
pass_old = NULL;
retval = PAM_SUCCESS;
diff --git a/source3/pam_smbpass/support.c b/source3/pam_smbpass/support.c
index 1e66f40..b6cf3a8 100644
--- a/source3/pam_smbpass/support.c
+++ b/source3/pam_smbpass/support.c
@@ -85,7 +85,7 @@ int converse( pam_handle_t * pamh, int ctrl, int nargs
int retval;
struct pam_conv *conv;
- retval = pam_get_item(pamh, PAM_CONV, (const void **) conv);
+ retval = _pam_get_item(pamh, PAM_CONV, conv);
if (retval == PAM_SUCCESS) {
retval = conv-conv(nargs, (const struct pam_message **) message
@@ -278,7 +278,7 @@ void _cleanup_failures( pam_handle_t * pamh, void *fl, int
err )
/* log the number of authentication failures */
if (failure-count != 0) {
-pam_get_item( pamh, PAM_SERVICE, (const void **) service );
+_pam_get_item( pamh, PAM_SERVICE, service );
_log_err( LOG_NOTICE
, %d authentication %s
from %s for service %s as %s(%d)
@@ -334,7 +334,7 @@ int _smb_verify_password( pam_handle_t * pamh, struct samu
*sampass,
} else {
const char *service;
-pam_get_item( pamh, PAM_SERVICE, (const void **)service );
+_pam_get_item( pamh, PAM_SERVICE, service );
_log_err( LOG_NOTICE, failed auth request by %s for service %s as
%s,
uidtoname(getuid()), service ? service : **unknown**,
name);
return PAM_AUTH_ERR;
@@ -369,7 +369,7 @@ int _smb_verify_password( pam_handle_t * pamh, struct samu
*sampass,
const char *service;
-pam_get_item( pamh, PAM_SERVICE, (const void **)service );
+_pam_get_item( pamh, PAM_SERVICE, service );
if (data_name != NULL) {
struct _pam_failed_auth *newauth = NULL;
@@ -382,7 +382,7 @@ int
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1775-geb5e8dc
The branch, master has been updated
via eb5e8dc82efae20c95a391a15c1264f2267e5a74 (commit)
via a75698bdf3b62d43e4909e5bfded70f6675b2058 (commit)
via 05e6ebb7f812eed95b8407e65cf438e04d6e3789 (commit)
from 1950e180caf707346300b83021624d586cc3776d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit eb5e8dc82efae20c95a391a15c1264f2267e5a74
Author: Günther Deschner g...@samba.org
Date: Mon May 25 13:08:58 2009 +0200
s4-smbtorture: add RPC-SAMR-LARGE-DC test.
This rather simple test creates 4500 objects on a domain controller and
checks
the enum calls for the correct number of results.
Guenther
commit a75698bdf3b62d43e4909e5bfded70f6675b2058
Author: Günther Deschner g...@samba.org
Date: Fri May 22 19:04:25 2009 +0200
s4-smbtorture: rename test_EnumDomain{Users,Groups,Aliases} in RPC-SAMR.
Guenther
commit 05e6ebb7f812eed95b8407e65cf438e04d6e3789
Author: Günther Deschner g...@samba.org
Date: Thu May 21 18:12:29 2009 +0200
s4-smbtorture: re-work test_Create{User,Group,Alias} a little.
Guenther
---
Summary of changes:
source4/torture/rpc/rpc.c |1 +
source4/torture/rpc/samr.c | 407 +---
2 files changed, 382 insertions(+), 26 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index 48a4887..19b223b 100644
--- a/source4/torture/rpc/rpc.c
+++ b/source4/torture/rpc/rpc.c
@@ -409,6 +409,7 @@ NTSTATUS torture_rpc_init(void)
torture_suite_add_suite(suite, torture_rpc_samr_accessmask(suite));
torture_suite_add_suite(suite,
torture_rpc_samr_passwords_pwdlastset(suite));
torture_suite_add_suite(suite, torture_rpc_samr_user_privileges(suite));
+ torture_suite_add_suite(suite, torture_rpc_samr_large_dc(suite));
torture_suite_add_suite(suite, torture_rpc_epmapper(suite));
torture_suite_add_suite(suite, torture_rpc_initshutdown(suite));
torture_suite_add_suite(suite, torture_rpc_oxidresolve(suite));
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 692dddf..92ce66f 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -48,7 +48,10 @@ enum torture_samr_choice {
TORTURE_SAMR_PASSWORDS_PWDLASTSET,
TORTURE_SAMR_USER_ATTRIBUTES,
TORTURE_SAMR_USER_PRIVILEGES,
- TORTURE_SAMR_OTHER
+ TORTURE_SAMR_OTHER,
+ TORTURE_SAMR_MANY_ACCOUNTS,
+ TORTURE_SAMR_MANY_GROUPS,
+ TORTURE_SAMR_MANY_ALIASES
};
static bool test_QueryUserInfo(struct dcerpc_pipe *p,
@@ -3999,9 +4002,11 @@ static bool test_DeleteAlias(struct dcerpc_pipe *p,
}
static bool test_CreateAlias(struct dcerpc_pipe *p, struct torture_context
*tctx,
- struct policy_handle *domain_handle,
+struct policy_handle *domain_handle,
+const char *alias_name,
struct policy_handle *alias_handle,
-const struct dom_sid *domain_sid)
+const struct dom_sid *domain_sid,
+bool test_alias)
{
NTSTATUS status;
struct samr_CreateDomAlias r;
@@ -4009,7 +4014,7 @@ static bool test_CreateAlias(struct dcerpc_pipe *p,
struct torture_context *tctx
uint32_t rid;
bool ret = true;
- init_lsa_String(name, TEST_ALIASNAME);
+ init_lsa_String(name, alias_name);
r.in.domain_handle = domain_handle;
r.in.alias_name = name;
r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
@@ -4043,6 +4048,10 @@ static bool test_CreateAlias(struct dcerpc_pipe *p,
struct torture_context *tctx
return false;
}
+ if (!test_alias) {
+ return ret;
+ }
+
if (!test_alias_ops(p, tctx, alias_handle, domain_sid)) {
ret = false;
}
@@ -4217,10 +4226,12 @@ static bool test_ChangePassword(struct dcerpc_pipe *p,
static bool test_CreateUser(struct dcerpc_pipe *p, struct torture_context
*tctx,
struct policy_handle *domain_handle,
+ const char *user_name,
struct policy_handle *user_handle_out,
struct dom_sid *domain_sid,
enum torture_samr_choice which_ops,
- struct cli_credentials *machine_credentials)
+ struct cli_credentials *machine_credentials,
+ bool test_user)
{
TALLOC_CTX *user_ctx;
@@ -4239,7 +4250,7 @@ static bool test_CreateUser(struct dcerpc_pipe *p, struct
torture_context *tctx,
struct policy_handle user_handle;
user_ctx =
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1776-gf0139e3
The branch, master has been updated via f0139e3b69a866a6154d0b349410fc0b3bfc30af (commit) from eb5e8dc82efae20c95a391a15c1264f2267e5a74 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f0139e3b69a866a6154d0b349410fc0b3bfc30af Author: Günther Deschner g...@samba.org Date: Mon May 25 14:03:16 2009 +0200 s3-selftest: enable RPC-SAMR-LARGE-DC against Samba3. This will fail for alias creation as nss_wrapper does not yet wrap around libnss_winbind. Guenther --- Summary of changes: source3/script/tests/test_posix_s3.sh |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh index a3c8e09..0bcf369 100755 --- a/source3/script/tests/test_posix_s3.sh +++ b/source3/script/tests/test_posix_s3.sh @@ -42,7 +42,7 @@ rpc=$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC rpc=$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME rpc=$rpc RPC-SVCCTL RPC-SPOOLSS RPC-SPOOLSS-WIN RPC-NTSVCS rpc=$rpc RPC-LSA-GETUSER RPC-LSA-LOOKUPSIDS RPC-LSA-LOOKUPNAMES -rpc=$rpc RPC-SAMR-USERS RPC-SAMR-USERS-PRIVILEGES RPC-SAMR-PASSWORDS RPC-SAMR-PASSWORDS-PWDLASTSET RPC-JOIN +rpc=$rpc RPC-SAMR-USERS RPC-SAMR-USERS-PRIVILEGES RPC-SAMR-PASSWORDS RPC-SAMR-PASSWORDS-PWDLASTSET RPC-SAMR-LARGE-DC RPC-JOIN rpc=$rpc RPC-SCHANNEL RPC-SCHANNEL2 RPC-BENCH-SCHANNEL1 # NOTE: to enable the UNIX-WHOAMI test, we need to change the default share -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1777-gfca7dce
The branch, master has been updated
via fca7dce1a908570e463ddcbd663955fcafd1d843 (commit)
from f0139e3b69a866a6154d0b349410fc0b3bfc30af (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit fca7dce1a908570e463ddcbd663955fcafd1d843
Author: Günther Deschner g...@samba.org
Date: Mon May 25 14:05:18 2009 +0200
s3-samr: Fix Bug #6372, usermanager only displaying 1024 groups and aliases.
This is now also verified with the RPC-SAMR-LARGE-DC test.
Guenther
---
Summary of changes:
source3/rpc_server/srv_samr_nt.c | 12
1 files changed, 12 insertions(+), 0 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 d528c80..26bc44c 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -1109,6 +1109,12 @@ NTSTATUS _samr_EnumDomainGroups(pipes_struct *p,
make_group_sam_entry_list(p-mem_ctx, samr_entries,
num_groups, groups);
+ if (MAX_SAM_ENTRIES = num_groups) {
+ status = STATUS_MORE_ENTRIES;
+ } else {
+ status = NT_STATUS_OK;
+ }
+
samr_array-count = num_groups;
samr_array-entries = samr_entries;
@@ -1174,6 +1180,12 @@ NTSTATUS _samr_EnumDomainAliases(pipes_struct *p,
DEBUG(5,(_samr_EnumDomainAliases: %d\n, __LINE__));
+ if (MAX_SAM_ENTRIES = num_aliases) {
+ status = STATUS_MORE_ENTRIES;
+ } else {
+ status = NT_STATUS_OK;
+ }
+
samr_array-count = num_aliases;
samr_array-entries = samr_entries;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1062-g6990781
The branch, v3-4-test has been updated
via 69907810fee3253096958bf174a052d3cb3b385c (commit)
via e9ed9e7f90c39d38dd40871bb915adda2e9951ff (commit)
via c1dca5a5f0becdd5f7041e91245cf9d9ae0dfd13 (commit)
via b4817feb9ec5e9ac9e610fdda31dfa64295c6822 (commit)
via 5e726f1843cd8ecb29588f6a00196354c6bc6708 (commit)
via 7e41fce5aa9b97eb4cf3c29bf6542b05051e1f27 (commit)
via e172757782d17ba1066d1cefe18e2a8d55b3ce96 (commit)
from 31eec30c33b300d93f6d6895f6d0e6b06e0c2185 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 69907810fee3253096958bf174a052d3cb3b385c
Author: Günther Deschner g...@samba.org
Date: Mon May 25 14:05:18 2009 +0200
s3-samr: Fix Bug #6372, usermanager only displaying 1024 groups and aliases.
This is now also verified with the RPC-SAMR-LARGE-DC test.
Guenther
(cherry picked from commit fca7dce1a908570e463ddcbd663955fcafd1d843)
commit e9ed9e7f90c39d38dd40871bb915adda2e9951ff
Author: Günther Deschner g...@samba.org
Date: Mon May 25 14:03:16 2009 +0200
s3-selftest: enable RPC-SAMR-LARGE-DC against Samba3.
This will fail for alias creation as nss_wrapper does not yet wrap around
libnss_winbind.
Guenther
(cherry picked from commit f0139e3b69a866a6154d0b349410fc0b3bfc30af)
commit c1dca5a5f0becdd5f7041e91245cf9d9ae0dfd13
Author: Günther Deschner g...@samba.org
Date: Mon May 25 13:08:58 2009 +0200
s4-smbtorture: add RPC-SAMR-LARGE-DC test.
This rather simple test creates 4500 objects on a domain controller and
checks
the enum calls for the correct number of results.
Guenther
(cherry picked from commit eb5e8dc82efae20c95a391a15c1264f2267e5a74)
commit b4817feb9ec5e9ac9e610fdda31dfa64295c6822
Author: Günther Deschner g...@samba.org
Date: Fri May 22 19:04:25 2009 +0200
s4-smbtorture: rename test_EnumDomain{Users,Groups,Aliases} in RPC-SAMR.
Guenther
(cherry picked from commit a75698bdf3b62d43e4909e5bfded70f6675b2058)
commit 5e726f1843cd8ecb29588f6a00196354c6bc6708
Author: Günther Deschner g...@samba.org
Date: Thu May 21 18:12:29 2009 +0200
s4-smbtorture: re-work test_Create{User,Group,Alias} a little.
Guenther
(cherry picked from commit 05e6ebb7f812eed95b8407e65cf438e04d6e3789)
commit 7e41fce5aa9b97eb4cf3c29bf6542b05051e1f27
Author: Günther Deschner g...@samba.org
Date: Fri May 22 17:56:37 2009 +0200
s3-pamsmbpass: copy _pam_get_item and _pam_get_data from pam_winbind.
Guenther
(cherry picked from commit 1950e180caf707346300b83021624d586cc3776d)
commit e172757782d17ba1066d1cefe18e2a8d55b3ce96
Author: Günther Deschner g...@samba.org
Date: Fri May 22 16:48:01 2009 +0200
s3-rpcclient: use get_domain_handle() fn in enum domain users groups.
Guenther
(cherry picked from commit 86d087fccc30a82cb1fe3a71d0353634496e72c4)
---
Summary of changes:
source3/pam_smbpass/pam_smb_auth.c|4 +-
source3/pam_smbpass/pam_smb_passwd.c |8 +-
source3/pam_smbpass/support.c | 38 +++-
source3/pam_smbpass/support.h |7 +
source3/rpc_server/srv_samr_nt.c | 12 +
source3/rpcclient/cmd_samr.c | 22 +-
source3/script/tests/test_posix_s3.sh |2 +-
source4/torture/rpc/rpc.c |1 +
source4/torture/rpc/samr.c| 407 ++--
9 files changed, 447 insertions(+), 54 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/pam_smbpass/pam_smb_auth.c
b/source3/pam_smbpass/pam_smb_auth.c
index 3dceb52..b5a6a47 100644
--- a/source3/pam_smbpass/pam_smb_auth.c
+++ b/source3/pam_smbpass/pam_smb_auth.c
@@ -179,7 +179,7 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags,
retval = PAM_SUCCESS;
- pam_get_data(pamh, smb_setcred_return, (const void **) pretval);
+ _pam_get_data(pamh, smb_setcred_return, pretval);
if(pretval) {
retval = *pretval;
SAFE_FREE(pretval);
@@ -199,7 +199,7 @@ static int _smb_add_user(pam_handle_t *pamh, unsigned int
ctrl,
int retval;
/* Get the authtok; if we don't have one, silently fail. */
- retval = pam_get_item( pamh, PAM_AUTHTOK, (const void **) pass );
+ retval = _pam_get_item( pamh, PAM_AUTHTOK, pass );
if (retval != PAM_SUCCESS) {
_log_err( LOG_ALERT
diff --git a/source3/pam_smbpass/pam_smb_passwd.c
b/source3/pam_smbpass/pam_smb_passwd.c
index b6de43f..dce6e01 100644
--- a/source3/pam_smbpass/pam_smb_passwd.c
+++ b/source3/pam_smbpass/pam_smb_passwd.c
@@ -229,11 +229,11 @@ int pam_sm_chauthtok(pam_handle_t *pamh, int flags,
*/
if (off( SMB_NOT_SET_PASS, ctrl )) {
-retval = pam_get_item( pamh, PAM_OLDAUTHTOK,
-
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1779-g3111d78
The branch, master has been updated
via 3111d78001f458cfcaf81123a1d1c23d5927a6c2 (commit)
via 35c3f4162d15f9846a645444e623178b78c52994 (commit)
from fca7dce1a908570e463ddcbd663955fcafd1d843 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3111d78001f458cfcaf81123a1d1c23d5927a6c2
Author: Michael Adam ob...@samba.org
Date: Mon May 25 11:54:43 2009 +0200
s3:winbind:idmap_ldap: warn about duplicate SID-XID mappings (bug #6387)
With the current infrastructure, we should not return error on
duplicate mappings but just warn instead (because an error would
trigger the attempt to create yet another mapping).
Michael
commit 35c3f4162d15f9846a645444e623178b78c52994
Author: Michael Adam ob...@samba.org
Date: Mon May 25 11:29:14 2009 +0200
s3:winbind:idmap_ldap: warn about duplicate XID-SID mappings (bug #6387)
With the current infrastructure, we should not return error on
duplicate mappings but just warn instead (because an error would
trigger the attempt to create yet another mapping).
Michael
---
Summary of changes:
source3/winbindd/idmap_ldap.c | 21 +++--
1 files changed, 19 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c
index 854fd21..88ece8c 100644
--- a/source3/winbindd/idmap_ldap.c
+++ b/source3/winbindd/idmap_ldap.c
@@ -1055,6 +1055,14 @@ again:
TALLOC_FREE(sidstr);
continue;
}
+
+ if (map-status == ID_MAPPED) {
+ DEBUG(1, (WARNING: duplicate %s mapping in LDAP.
+ overwriting mapping %u - %s with %u - %s\n,
+ (type == ID_TYPE_UID) ? UID : GID,
+ id, sid_string_dbg(map-sid), id, sidstr));
+ }
+
TALLOC_FREE(sidstr);
/* mapped */
@@ -1249,8 +1257,6 @@ again:
continue;
}
- TALLOC_FREE(sidstr);
-
/* now try to see if it is a uid, if not try with a gid
* (gid is more common, but in case both uidNumber and
* gidNumber are returned the SID is mapped to the uid
@@ -1268,6 +1274,7 @@ again:
if ( ! tmp) { /* no ids ?? */
DEBUG(5, (no uidNumber,
nor gidNumber attributes found\n));
+ TALLOC_FREE(sidstr);
continue;
}
@@ -1278,11 +1285,21 @@ again:
DEBUG(5, (Requested id (%u) out of range (%u - %u).
Filtered!\n, id,
ctx-filter_low_id, ctx-filter_high_id));
+ TALLOC_FREE(sidstr);
TALLOC_FREE(tmp);
continue;
}
TALLOC_FREE(tmp);
+ if (map-status == ID_MAPPED) {
+ DEBUG(1, (WARNING: duplicate %s mapping in LDAP.
+ overwriting mapping %s - %u with %s - %u\n,
+ (type == ID_TYPE_UID) ? UID : GID,
+ sidstr, map-xid.id, sidstr, id));
+ }
+
+ TALLOC_FREE(sidstr);
+
/* mapped */
map-xid.type = type;
map-xid.id = id;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1064-g5328f60
The branch, v3-4-test has been updated
via 5328f600bbc6535d8880b1b0c74bcfbd9b7a162a (commit)
via 751b6b07c5ea25809b1766a01fc859d580304ae9 (commit)
from 69907810fee3253096958bf174a052d3cb3b385c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 5328f600bbc6535d8880b1b0c74bcfbd9b7a162a
Author: Michael Adam ob...@samba.org
Date: Mon May 25 11:54:43 2009 +0200
s3:winbind:idmap_ldap: warn about duplicate SID-XID mappings (bug #6387)
With the current infrastructure, we should not return error on
duplicate mappings but just warn instead (because an error would
trigger the attempt to create yet another mapping).
Michael
(cherry picked from commit 3111d78001f458cfcaf81123a1d1c23d5927a6c2)
commit 751b6b07c5ea25809b1766a01fc859d580304ae9
Author: Michael Adam ob...@samba.org
Date: Mon May 25 11:29:14 2009 +0200
s3:winbind:idmap_ldap: warn about duplicate XID-SID mappings (bug #6387)
With the current infrastructure, we should not return error on
duplicate mappings but just warn instead (because an error would
trigger the attempt to create yet another mapping).
Michael
(cherry picked from commit 35c3f4162d15f9846a645444e623178b78c52994)
---
Summary of changes:
source3/winbindd/idmap_ldap.c | 21 +++--
1 files changed, 19 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c
index 854fd21..88ece8c 100644
--- a/source3/winbindd/idmap_ldap.c
+++ b/source3/winbindd/idmap_ldap.c
@@ -1055,6 +1055,14 @@ again:
TALLOC_FREE(sidstr);
continue;
}
+
+ if (map-status == ID_MAPPED) {
+ DEBUG(1, (WARNING: duplicate %s mapping in LDAP.
+ overwriting mapping %u - %s with %u - %s\n,
+ (type == ID_TYPE_UID) ? UID : GID,
+ id, sid_string_dbg(map-sid), id, sidstr));
+ }
+
TALLOC_FREE(sidstr);
/* mapped */
@@ -1249,8 +1257,6 @@ again:
continue;
}
- TALLOC_FREE(sidstr);
-
/* now try to see if it is a uid, if not try with a gid
* (gid is more common, but in case both uidNumber and
* gidNumber are returned the SID is mapped to the uid
@@ -1268,6 +1274,7 @@ again:
if ( ! tmp) { /* no ids ?? */
DEBUG(5, (no uidNumber,
nor gidNumber attributes found\n));
+ TALLOC_FREE(sidstr);
continue;
}
@@ -1278,11 +1285,21 @@ again:
DEBUG(5, (Requested id (%u) out of range (%u - %u).
Filtered!\n, id,
ctx-filter_low_id, ctx-filter_high_id));
+ TALLOC_FREE(sidstr);
TALLOC_FREE(tmp);
continue;
}
TALLOC_FREE(tmp);
+ if (map-status == ID_MAPPED) {
+ DEBUG(1, (WARNING: duplicate %s mapping in LDAP.
+ overwriting mapping %s - %u with %s - %u\n,
+ (type == ID_TYPE_UID) ? UID : GID,
+ sidstr, map-xid.id, sidstr, id));
+ }
+
+ TALLOC_FREE(sidstr);
+
/* mapped */
map-xid.type = type;
map-xid.id = id;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1780-g4258750
The branch, master has been updated via 4258750e4f112040b3537c2c479f62b6e59b32e3 (commit) from 3111d78001f458cfcaf81123a1d1c23d5927a6c2 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 4258750e4f112040b3537c2c479f62b6e59b32e3 Author: Günther Deschner g...@samba.org Date: Mon May 25 15:55:26 2009 +0200 s3-selftest: fix typo. Guenther --- Summary of changes: source3/script/tests/selftest.sh |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh index 1e84d1c..1f3ad76 100755 --- a/source3/script/tests/selftest.sh +++ b/source3/script/tests/selftest.sh @@ -217,10 +217,10 @@ cat $SERVERCONFFILEEOF time server = yes add user script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action add --name %u - add group script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper_pl --path $NSS_WRAPPER_GROUP --type group --action add --name %g + add group script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_GROUP --type group --action add --name %g add machine script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action add --name %u delete user script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action delete --name %u - delete group script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper_pl --path $NSS_WRAPPER_GROUP --type group --action delete --name %g + delete group script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_GROUP --type group --action delete --name %g kernel oplocks = no kernel change notify = no -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1065-gb934426
The branch, v3-4-test has been updated via b9344264c0d2108fbbb6ed9b19da9a56b6444211 (commit) from 5328f600bbc6535d8880b1b0c74bcfbd9b7a162a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit b9344264c0d2108fbbb6ed9b19da9a56b6444211 Author: Günther Deschner g...@samba.org Date: Mon May 25 15:55:26 2009 +0200 s3-selftest: fix typo. Guenther (cherry picked from commit 4258750e4f112040b3537c2c479f62b6e59b32e3) --- Summary of changes: source3/script/tests/selftest.sh |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh index ee4257f..6174b0f 100755 --- a/source3/script/tests/selftest.sh +++ b/source3/script/tests/selftest.sh @@ -217,10 +217,10 @@ cat $SERVERCONFFILEEOF time server = yes add user script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action add --name %u - add group script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper_pl --path $NSS_WRAPPER_GROUP --type group --action add --name %g + add group script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_GROUP --type group --action add --name %g add machine script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action add --name %u delete user script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action delete --name %u - delete group script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper_pl --path $NSS_WRAPPER_GROUP --type group --action delete --name %g + delete group script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_GROUP --type group --action delete --name %g kernel oplocks = no kernel change notify = no -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1781-g95dbd7d
The branch, master has been updated
via 95dbd7d6dce2583e785a17d5862a1a16838ec352 (commit)
from 4258750e4f112040b3537c2c479f62b6e59b32e3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 95dbd7d6dce2583e785a17d5862a1a16838ec352
Author: Slava Semushin php-co...@altlinux.ru
Date: Sat May 23 21:02:40 2009 +0700
nsswitch/winbind_nss_aix.c(fill_grent): fixed memory leak.
Found by cppcheck:
[./nsswitch/winbind_nss_aix.c:241]: (error) Memory leak: result
---
Summary of changes:
nsswitch/winbind_nss_aix.c |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/winbind_nss_aix.c b/nsswitch/winbind_nss_aix.c
index 17578cf..66200f3 100644
--- a/nsswitch/winbind_nss_aix.c
+++ b/nsswitch/winbind_nss_aix.c
@@ -237,6 +237,9 @@ static struct group *fill_grent(struct winbindd_gr *gr,
char *gr_mem)
result-gr_mem = (char **)malloc(sizeof(char *) * (gr-num_gr_mem+1));
if (!result-gr_mem) {
+ free(result-gr_name);
+ free(result-gr_passwd);
+ free(result);
errno = ENOMEM;
return NULL;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1066-gbfe6186
The branch, v3-4-test has been updated
via bfe6186c600470916d73c3d3b17b6dfc27c299bd (commit)
from b9344264c0d2108fbbb6ed9b19da9a56b6444211 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit bfe6186c600470916d73c3d3b17b6dfc27c299bd
Author: Slava Semushin php-co...@altlinux.ru
Date: Sat May 23 21:02:40 2009 +0700
nsswitch/winbind_nss_aix.c(fill_grent): fixed memory leak.
Found by cppcheck:
[./nsswitch/winbind_nss_aix.c:241]: (error) Memory leak: result
---
Summary of changes:
nsswitch/winbind_nss_aix.c |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/winbind_nss_aix.c b/nsswitch/winbind_nss_aix.c
index 17578cf..66200f3 100644
--- a/nsswitch/winbind_nss_aix.c
+++ b/nsswitch/winbind_nss_aix.c
@@ -237,6 +237,9 @@ static struct group *fill_grent(struct winbindd_gr *gr,
char *gr_mem)
result-gr_mem = (char **)malloc(sizeof(char *) * (gr-num_gr_mem+1));
if (!result-gr_mem) {
+ free(result-gr_name);
+ free(result-gr_passwd);
+ free(result);
errno = ENOMEM;
return NULL;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1782-g5d2cd81
The branch, master has been updated
via 5d2cd816459a30107b4ea011c1874b051aa29b1c (commit)
from 95dbd7d6dce2583e785a17d5862a1a16838ec352 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5d2cd816459a30107b4ea011c1874b051aa29b1c
Author: Slava Semushin php-co...@altlinux.ru
Date: Sat May 23 20:51:53 2009 +0700
source{3,4}/torture/smbiconv.c(main): fixed file descriptor leak.
File descriptor leaks only when we use file instead of stdout.
Found by cppcheck:
[./source3/torture/smbiconv.c:219]: (error) Resource leak: out
[./source4/torture/smbiconv.c:211]: (error) Resource leak: out
---
Summary of changes:
source3/torture/smbiconv.c |1 +
source4/torture/smbiconv.c |1 +
2 files changed, 2 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/torture/smbiconv.c b/source3/torture/smbiconv.c
index 72fbdc4..47353d2 100644
--- a/source3/torture/smbiconv.c
+++ b/source3/torture/smbiconv.c
@@ -216,6 +216,7 @@ int main(int argc, char *argv[])
cd = smb_iconv_open(to, from);
if (cd == (smb_iconv_t)-1) {
DEBUG(0,(unable to find from or to encoding, exiting...\n));
+ if (out != stdout) fclose(out);
return 1;
}
diff --git a/source4/torture/smbiconv.c b/source4/torture/smbiconv.c
index 4eece66..173f371 100644
--- a/source4/torture/smbiconv.c
+++ b/source4/torture/smbiconv.c
@@ -208,6 +208,7 @@ int main(int argc, char *argv[])
cd = smb_iconv_open_ex(tctx, to, from, lp_parm_bool(tctx-lp_ctx, NULL,
iconv, native, true));
if((int)cd == -1) {
DEBUG(0,(unable to find from or to encoding, exiting...\n));
+ if (out != stdout) fclose(out);
return 1;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1067-g61cca8a
The branch, v3-4-test has been updated
via 61cca8aa5f5e3ad665c3b1acfab20802dd0f3f3a (commit)
from bfe6186c600470916d73c3d3b17b6dfc27c299bd (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 61cca8aa5f5e3ad665c3b1acfab20802dd0f3f3a
Author: Slava Semushin php-co...@altlinux.ru
Date: Sat May 23 20:51:53 2009 +0700
source{3,4}/torture/smbiconv.c(main): fixed file descriptor leak.
File descriptor leaks only when we use file instead of stdout.
Found by cppcheck:
[./source3/torture/smbiconv.c:219]: (error) Resource leak: out
[./source4/torture/smbiconv.c:211]: (error) Resource leak: out
---
Summary of changes:
source3/torture/smbiconv.c |1 +
source4/torture/smbiconv.c |1 +
2 files changed, 2 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/torture/smbiconv.c b/source3/torture/smbiconv.c
index 72fbdc4..47353d2 100644
--- a/source3/torture/smbiconv.c
+++ b/source3/torture/smbiconv.c
@@ -216,6 +216,7 @@ int main(int argc, char *argv[])
cd = smb_iconv_open(to, from);
if (cd == (smb_iconv_t)-1) {
DEBUG(0,(unable to find from or to encoding, exiting...\n));
+ if (out != stdout) fclose(out);
return 1;
}
diff --git a/source4/torture/smbiconv.c b/source4/torture/smbiconv.c
index 4eece66..173f371 100644
--- a/source4/torture/smbiconv.c
+++ b/source4/torture/smbiconv.c
@@ -208,6 +208,7 @@ int main(int argc, char *argv[])
cd = smb_iconv_open_ex(tctx, to, from, lp_parm_bool(tctx-lp_ctx, NULL,
iconv, native, true));
if((int)cd == -1) {
DEBUG(0,(unable to find from or to encoding, exiting...\n));
+ if (out != stdout) fclose(out);
return 1;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1783-g326237c
The branch, master has been updated
via 326237c4dd3bb03865a3510296aa925e22ea3302 (commit)
from 5d2cd816459a30107b4ea011c1874b051aa29b1c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 326237c4dd3bb03865a3510296aa925e22ea3302
Author: Slava Semushin php-co...@altlinux.ru
Date: Sat May 23 01:10:05 2009 +0700
source3/utils/log2pcaphex.c(main): fixed file descriptors leak.
One of leaks found by cppcheck:
[./source3/utils/log2pcaphex.c:367]: (error) Resource leak: out
---
Summary of changes:
source3/utils/log2pcaphex.c |8
1 files changed, 8 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/log2pcaphex.c b/source3/utils/log2pcaphex.c
index 072d659..b1a8a27 100644
--- a/source3/utils/log2pcaphex.c
+++ b/source3/utils/log2pcaphex.c
@@ -364,5 +364,13 @@ int main (int argc, char **argv)
}
}
+ if (in != stdin) {
+ fclose(in);
+ }
+
+ if (out != stdout) {
+ fclose(out);
+ }
+
return 0;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1068-g8987ca2
The branch, v3-4-test has been updated
via 8987ca29062db53db117d6c9d9ce2ad01ed17d22 (commit)
from 61cca8aa5f5e3ad665c3b1acfab20802dd0f3f3a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 8987ca29062db53db117d6c9d9ce2ad01ed17d22
Author: Slava Semushin php-co...@altlinux.ru
Date: Sat May 23 01:10:05 2009 +0700
source3/utils/log2pcaphex.c(main): fixed file descriptors leak.
One of leaks found by cppcheck:
[./source3/utils/log2pcaphex.c:367]: (error) Resource leak: out
---
Summary of changes:
source3/utils/log2pcaphex.c |8
1 files changed, 8 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/log2pcaphex.c b/source3/utils/log2pcaphex.c
index 072d659..b1a8a27 100644
--- a/source3/utils/log2pcaphex.c
+++ b/source3/utils/log2pcaphex.c
@@ -364,5 +364,13 @@ int main (int argc, char **argv)
}
}
+ if (in != stdin) {
+ fclose(in);
+ }
+
+ if (out != stdout) {
+ fclose(out);
+ }
+
return 0;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1784-gf5a5c6a
The branch, master has been updated
via f5a5c6a5dcf6be2486c53138e24f8d76b64f882e (commit)
from 326237c4dd3bb03865a3510296aa925e22ea3302 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f5a5c6a5dcf6be2486c53138e24f8d76b64f882e
Author: Michael Adam ob...@samba.org
Date: Mon May 25 21:59:40 2009 +0200
s3:dbwrap_ctdb: fix some function header comments
Michael
---
Summary of changes:
source3/lib/dbwrap_ctdb.c | 15 ---
1 files changed, 12 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index 4a5bf6d..e38f76f 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -212,14 +212,20 @@ static struct ctdb_rec_data
*db_ctdb_marshall_loop_next(struct ctdb_marshall_buf
-/* start a transaction on a database */
+/**
+ * CTDB transaction destructor
+ */
static int db_ctdb_transaction_destructor(struct db_ctdb_transaction_handle *h)
{
tdb_transaction_cancel(h-ctx-wtdb-tdb);
return 0;
}
-/* start a transaction on a database */
+/**
+ * start a transaction on a ctdb database:
+ * - lock the transaction lock key
+ * - start the tdb transaction
+ */
static int db_ctdb_transaction_fetch_start(struct db_ctdb_transaction_handle
*h)
{
struct db_record *rh;
@@ -268,7 +274,10 @@ again:
}
-/* start a transaction on a database */
+/**
+ * CTDB dbwrap API: transaction_start function
+ * starts a transaction on a persistent database
+ */
static int db_ctdb_transaction_start(struct db_context *db)
{
struct db_ctdb_transaction_handle *h;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1785-g3a85344
The branch, master has been updated
via 3a853448cefaf3e0bcf5ece9ccd758b37e524251 (commit)
from f5a5c6a5dcf6be2486c53138e24f8d76b64f882e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3a853448cefaf3e0bcf5ece9ccd758b37e524251
Author: Michael Adam ob...@samba.org
Date: Mon May 25 11:55:51 2009 +0200
s3:winbind_util: remove trailing spaces
Michael
---
Summary of changes:
source3/winbindd/winbindd_util.c | 112 +++---
1 files changed, 56 insertions(+), 56 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index 29793da..9d38a9e 100644
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -1,21 +1,21 @@
-/*
+/*
Unix SMB/CIFS implementation.
Winbind daemon for ntdom nss module
Copyright (C) Tim Potter 2000-2001
Copyright (C) 2001 by Martin Pool m...@samba.org
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see http://www.gnu.org/licenses/.
*/
@@ -47,7 +47,7 @@ static struct winbindd_domain *_domain_list = NULL;
/**
When was the last scan of trusted domains done?
-
+
0 == not ever
*/
@@ -72,7 +72,7 @@ void free_domain_list(void)
while(domain) {
struct winbindd_domain *next = domain-next;
-
+
DLIST_REMOVE(_domain_list, domain);
SAFE_FREE(domain);
domain = next;
@@ -131,28 +131,28 @@ static struct winbindd_domain *add_trusted_domain(const
char *domain_name, const
init_domain_list() and we'll get stuck in a loop. */
for (domain = _domain_list; domain; domain = domain-next) {
if (strequal(domain_name, domain-name) ||
- strequal(domain_name, domain-alt_name))
+ strequal(domain_name, domain-alt_name))
{
- break;
+ break;
}
- if (alternative_name *alternative_name)
+ if (alternative_name *alternative_name)
{
if (strequal(alternative_name, domain-name) ||
- strequal(alternative_name, domain-alt_name))
+ strequal(alternative_name, domain-alt_name))
{
- break;
+ break;
}
}
- if (sid)
+ if (sid)
{
if (is_null_sid(sid)) {
- continue;
+ continue;
}
if (sid_equal(sid, domain-sid)) {
- break;
+ break;
}
}
}
@@ -164,8 +164,8 @@ static struct winbindd_domain *add_trusted_domain(const
char *domain_name, const
if ( sid_equal( domain-sid, global_sid_NULL ) )
sid_copy( domain-sid, sid );
- return domain;
- }
+ return domain;
+ }
/* Create new domain entry */
@@ -230,7 +230,7 @@ static struct winbindd_domain *add_trusted_domain(const
char *domain_name, const
done:
- DEBUG(2,(Added domain %s %s %s\n,
+ DEBUG(2,(Added domain %s %s %s\n,
domain-name, domain-alt_name,
domain-sid?sid_string_dbg(domain-sid):));
@@ -243,8 +243,8 @@ done:
struct trustdom_state {
TALLOC_CTX *mem_ctx;
- bool primary;
- bool forest_root;
+ bool primary;
+ bool forest_root;
struct winbindd_response *response;
};
@@ -338,11 +338,11 @@ static void trustdom_recv(void *private_data, bool
success)
if (!string_to_sid(sid, sidstr)) {
/* Allow NULL sid for sibling domains */
if ( strcmp(sidstr,S-0-0) == 0) {
- sid_copy( sid, global_sid_NULL);
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1787-gfb262f7
The branch, master has been updated
via fb262f79fab00374023e59476e8d05a1015a7041 (commit)
via a98ba0cbe9a05f1b681206cecb7558c24d89da49 (commit)
from 3a853448cefaf3e0bcf5ece9ccd758b37e524251 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit fb262f79fab00374023e59476e8d05a1015a7041
Author: Kai Blin k...@samba.org
Date: Thu May 14 11:39:01 2009 +0200
net: Use samba default command line arguments.
Attention:
The meaning of the -N flag changed.
To get the old meaning for net groupmap set, use the long option --ntname
The long option for using kerberos changed from --kerberos to --use-kerberos
net rpc commands will now prompt for a password if none is given.
As a benefit, net will now accept an authentication file like other samba
command line tools. So no need to specify the password on the command line
in
scripts anymore.
This should fix bug #6357
Signed-off-by: Kai Blin k...@samba.org
commit a98ba0cbe9a05f1b681206cecb7558c24d89da49
Author: Kai Blin k...@samba.org
Date: Wed May 20 12:07:07 2009 +0200
s3 ctags: ignore all proto.h files for tag generation
---
Summary of changes:
source3/Makefile.in |2 +-
source3/utils/net.c | 43
source3/utils/net.h |9 +---
source3/utils/net_ads.c | 81 ++---
source3/utils/net_dom.c |8 ++-
source3/utils/net_help.c|1 +
source3/utils/net_proto.h |3 -
source3/utils/net_rpc.c | 74 +-
source3/utils/net_rpc_join.c|3 +-
source3/utils/net_rpc_samsync.c |4 +-
source3/utils/net_rpc_shell.c |9 ++-
source3/utils/net_util.c| 109 ++
12 files changed, 136 insertions(+), 210 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 30bfb4b..1120092 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3076,7 +3076,7 @@ etags::
find $(srcdir)/.. -name *.[ch] | xargs -n 100 etags --append
$(ETAGS_OPTIONS)
ctags::
- ctags $(CTAGS_OPTIONS) `find $(srcdir)/.. -name *.[ch] | grep -v
include/proto\.h`
+ ctags $(CTAGS_OPTIONS) `find $(srcdir)/.. -name *.[ch] | grep -v
proto\.h`
realclean:: clean
-rm -f config.log bin/.dummy script/findsmb script/gen-8bit-gap.sh
diff --git a/source3/utils/net.c b/source3/utils/net.c
index 9cd41c5..0e3946f 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -625,7 +625,6 @@ static struct functable net_func[] = {
int main(int argc, const char **argv)
{
int opt,i;
- char *p;
int rc = 0;
int argc_new = 0;
const char ** argv_new;
@@ -636,12 +635,10 @@ static struct functable net_func[] = {
struct poptOption long_options[] = {
{help,'h', POPT_ARG_NONE, 0, 'h'},
{workgroup, 'w', POPT_ARG_STRING, c-opt_target_workgroup},
- {user,'U', POPT_ARG_STRING, c-opt_user_name, 'U'},
{ipaddress, 'I', POPT_ARG_STRING, 0,'I'},
{port,'p', POPT_ARG_INT,c-opt_port},
{myname, 'n', POPT_ARG_STRING, c-opt_requester_name},
{server, 'S', POPT_ARG_STRING, c-opt_host},
- {encrypt, 'e', POPT_ARG_NONE, NULL, 'e', Encrypt SMB
transport (UNIX extended servers only) },
{container, 'c', POPT_ARG_STRING, c-opt_container},
{comment, 'C', POPT_ARG_STRING, c-opt_comment},
{maxusers,'M', POPT_ARG_INT,c-opt_maxusers},
@@ -652,15 +649,13 @@ static struct functable net_func[] = {
{stdin, 'i', POPT_ARG_NONE, c-opt_stdin},
{timeout, 't', POPT_ARG_INT,c-opt_timeout},
{request-timeout,0,POPT_ARG_INT,c-opt_request_timeout},
- {machine-pass,'P', POPT_ARG_NONE, c-opt_machine_pass},
- {kerberos,'k', POPT_ARG_NONE, c-opt_kerberos},
{myworkgroup, 'W', POPT_ARG_STRING, c-opt_workgroup},
{verbose, 'v', POPT_ARG_NONE, c-opt_verbose},
{test,'T', POPT_ARG_NONE, c-opt_testmode},
/* Options for 'net groupmap set' */
{local, 'L', POPT_ARG_NONE, c-opt_localgroup},
{domain, 'D', POPT_ARG_NONE, c-opt_domaingroup},
- {ntname, 'N', POPT_ARG_STRING, c-opt_newntname},
+ {ntname,0, POPT_ARG_STRING, c-opt_newntname},
{rid, 'R', POPT_ARG_INT,c-opt_rid},
/* Options for 'net rpc share migrate' */
{acls,0,
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1790-g714acfa
The branch, master has been updated
via 714acfac013a46c3677c3eb72ad57db6d97c7d61 (commit)
via 11f07599006cf2ce6760095d07bfe22680c3744e (commit)
via dfe06d21bdc4c715e02c9f80c4bc7144a0d9ee59 (commit)
from fb262f79fab00374023e59476e8d05a1015a7041 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 714acfac013a46c3677c3eb72ad57db6d97c7d61
Author: Michael Adam ob...@samba.org
Date: Tue May 26 00:47:15 2009 +0200
s3:dbwrap_tool: add listkeys operation
Michael
commit 11f07599006cf2ce6760095d07bfe22680c3744e
Author: Michael Adam ob...@samba.org
Date: Tue May 26 00:26:39 2009 +0200
s3:dbwrap_tool: remove superfluous command mapping
Michael
commit dfe06d21bdc4c715e02c9f80c4bc7144a0d9ee59
Author: Michael Adam ob...@samba.org
Date: Mon May 25 23:27:28 2009 +0200
s3:dbwrap_tool: add erase opearation
Michael
---
Summary of changes:
source3/utils/dbwrap_tool.c | 92 +++---
1 files changed, 85 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/dbwrap_tool.c b/source3/utils/dbwrap_tool.c
index 5172112..38b3903 100644
--- a/source3/utils/dbwrap_tool.c
+++ b/source3/utils/dbwrap_tool.c
@@ -23,7 +23,7 @@
extern bool AllowDebugChange;
-typedef enum { OP_FETCH, OP_STORE, OP_DELETE } dbwrap_op;
+typedef enum { OP_FETCH, OP_STORE, OP_DELETE, OP_ERASE, OP_LISTKEYS }
dbwrap_op;
typedef enum { TYPE_INT32, TYPE_UINT32 } dbwrap_type;
@@ -111,6 +111,67 @@ static int dbwrap_tool_delete(struct db_context *db,
return 0;
}
+static int delete_fn(struct db_record *rec, void *priv)
+{
+ rec-delete_rec(rec);
+ return 0;
+}
+
+/**
+ * dbwrap_tool_erase: erase the whole data base
+ * the keyname argument is not used.
+ */
+static int dbwrap_tool_erase(struct db_context *db,
+const char *keyname,
+void *data)
+{
+ int ret;
+
+ ret = db-traverse(db, delete_fn, NULL);
+
+ if (ret 0) {
+ d_fprintf(stderr, ERROR erasing the database\n);
+ return -1;
+ }
+
+ return 0;
+}
+
+static int listkey_fn(struct db_record *rec, void *private_data)
+{
+ int length = rec-key.dsize;
+ unsigned char *p = (unsigned char *)rec-key.dptr;
+
+ while (length--) {
+ if (isprint(*p) !strchr(\\\, *p)) {
+ d_printf(%c, *p);
+ } else {
+ d_printf(\\%02X, *p);
+ }
+ p++;
+ }
+
+ d_printf(\n);
+
+ return 0;
+}
+
+static int dbwrap_tool_listkeys(struct db_context *db,
+ const char *keyname,
+ void *data)
+{
+ int ret;
+
+ ret = db-traverse_read(db, listkey_fn, NULL);
+
+ if (ret 0) {
+ d_fprintf(stderr, ERROR listing db keys\n);
+ return -1;
+ }
+
+ return 0;
+}
+
struct dbwrap_op_dispatch_table {
dbwrap_op op;
dbwrap_type type;
@@ -125,7 +186,8 @@ struct dbwrap_op_dispatch_table dispatch_table[] = {
{ OP_STORE, TYPE_INT32, dbwrap_tool_store_int32 },
{ OP_STORE, TYPE_UINT32, dbwrap_tool_store_uint32 },
{ OP_DELETE, TYPE_INT32, dbwrap_tool_delete },
- { OP_DELETE, TYPE_UINT32, dbwrap_tool_delete },
+ { OP_ERASE, TYPE_INT32, dbwrap_tool_erase },
+ { OP_LISTKEYS, TYPE_INT32, dbwrap_tool_listkeys },
{ 0, 0, NULL },
};
@@ -140,7 +202,7 @@ int main(int argc, const char **argv)
const char *dbname;
const char *opname;
dbwrap_op op;
- const char *keyname;
+ const char *keyname = ;
const char *keytype = int32;
dbwrap_type type;
const char *valuestr = 0;
@@ -156,10 +218,10 @@ int main(int argc, const char **argv)
AllowDebugChange = false;
lp_load(get_dyn_CONFIGFILE(), true, false, false, true);
- if ((argc != 4) (argc != 5) (argc != 6)) {
+ if ((argc 3) || (argc 6)) {
d_fprintf(stderr,
- USAGE: %s database op key [type [value]]\n
-ops: fetch, store, delete\n
+ USAGE: %s database op [key [type
[value]]]\n
+ops: fetch, store, delete, erase, listkeys\n
types: int32, uint32\n,
argv[0]);
goto done;
@@ -167,7 +229,6 @@ int main(int argc, const char **argv)
dbname = argv[1];
opname = argv[2];
- keyname = argv[3];
if (strcmp(opname, store) == 0) {
if (argc != 6) {
@@ -177,6 +238,7 @@ int main(int argc, const char **argv)
}
Build status as of Tue May 26 00:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-05-25 00:00:30.0 + +++ /home/build/master/cache/broken_results.txt 2009-05-26 00:01:01.0 + @@ -1,22 +1,22 @@ -Build status as of Mon May 25 00:00:02 2009 +Build status as of Tue May 26 00:00:02 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 30 6 0 +ccache 32 6 0 distcc 0 0 0 -ldb 31 31 0 -libreplace 30 11 0 +ldb 32 32 0 +libreplace 32 11 0 lorikeet 0 0 0 pidl 21 3 0 ppp 14 0 0 rsync31 11 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 29 18 0 -samba_3_master 30 23 1 -samba_3_next 30 21 0 -samba_4_0_test 31 30 2 -talloc 30 31 0 -tdb 28 11 0 +samba_3_current 29 19 0 +samba_3_master 30 27 1 +samba_3_next 30 27 1 +samba_4_0_test 32 30 7 +talloc 32 32 0 +tdb 30 11 0
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1792-g6ef6538
The branch, master has been updated
via 6ef65389fd2f2bdcafe840e0cd0221bb9f26bdfc (commit)
via 86039855759ce38e6074f956073199b0ccd29bdf (commit)
from 714acfac013a46c3677c3eb72ad57db6d97c7d61 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6ef65389fd2f2bdcafe840e0cd0221bb9f26bdfc
Author: Andrew Bartlett abart...@samba.org
Date: Tue May 26 12:31:39 2009 +1000
Don't use crossRef records to find our own domain
A single AD server can only host a single domain, so don't stuff about
with looking up our crossRef record in the cn=Partitions container.
We instead trust that lp_realm() and lp_workgroup() works correctly.
Andrew Bartlett
commit 86039855759ce38e6074f956073199b0ccd29bdf
Author: Andrew Bartlett abart...@samba.org
Date: Tue May 26 11:43:37 2009 +1000
Add support for sendmsg() in socket_wrapper
This is required because the deferred connect code skips the connect()
until sending the packet, but unless we catch this call, the connect()
never happens.
Andrew Bartlett
---
Summary of changes:
lib/socket_wrapper/socket_wrapper.c | 71 +
lib/socket_wrapper/socket_wrapper.h |6 +
source4/auth/auth.h |8 +-
source4/auth/ntlm/auth_sam.c | 144 +++--
source4/auth/sam.c| 49 ++
source4/cldap_server/netlogon.c | 116 +++
source4/kdc/config.mk |4 +-
source4/kdc/hdb-samba4.c | 207
source4/kdc/kdc.h |4 +-
source4/kdc/pac-glue.c| 10 +-
source4/nbt_server/dgram/netlogon.c | 21 +--
source4/param/loadparm.c |1 +
source4/param/param.h |5 +
source4/param/util.c | 17 ++
source4/rpc_server/config.mk |3 +-
source4/rpc_server/lsa/lsa_init.c | 69 ++---
source4/rpc_server/netlogon/dcerpc_netlogon.c | 82 --
source4/rpc_server/samr/dcesrv_samr.c | 128 ---
18 files changed, 330 insertions(+), 615 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/socket_wrapper/socket_wrapper.c
b/lib/socket_wrapper/socket_wrapper.c
index d809d8a..bd848f9 100644
--- a/lib/socket_wrapper/socket_wrapper.c
+++ b/lib/socket_wrapper/socket_wrapper.c
@@ -118,6 +118,7 @@
#define real_setsockopt setsockopt
#define real_recvfrom recvfrom
#define real_sendto sendto
+#define real_sendmsg sendmsg
#define real_ioctl ioctl
#define real_recv recv
#define real_send send
@@ -2064,6 +2065,76 @@ _PUBLIC_ ssize_t swrap_send(int s, const void *buf,
size_t len, int flags)
return ret;
}
+_PUBLIC_ ssize_t swrap_sendmsg(int s, const struct msghdr *msg, int flags)
+{
+ int ret;
+ uint8_t *buf;
+ off_t ofs = 0;
+ size_t i;
+ size_t remain;
+
+ struct socket_info *si = find_socket_info(s);
+
+ if (!si) {
+ return real_sendmsg(s, msg, flags);
+ }
+
+ if (si-defer_connect) {
+ struct sockaddr_un un_addr;
+ int bcast = 0;
+
+ if (si-bound == 0) {
+ ret = swrap_auto_bind(si, si-family);
+ if (ret == -1) return -1;
+ }
+
+ ret = sockaddr_convert_to_un(si, si-peername, si-peername_len,
+un_addr, 0, bcast);
+ if (ret == -1) return -1;
+
+ ret = real_connect(s, (struct sockaddr *)un_addr,
+ sizeof(un_addr));
+
+ /* to give better errors */
+ if (ret == -1 errno == ENOENT) {
+ errno = EHOSTUNREACH;
+ }
+
+ if (ret == -1) {
+ return ret;
+ }
+ si-defer_connect = 0;
+ }
+
+ ret = real_sendmsg(s, msg, flags);
+ remain = ret;
+
+ /* we capture it as one single packet */
+ buf = (uint8_t *)malloc(ret);
+ if (!buf) {
+ /* we just not capture the packet */
+ errno = 0;
+ return ret;
+ }
+
+ for (i=0; i msg-msg_iovlen; i++) {
+ size_t this_time = MIN(remain, msg-msg_iov[i].iov_len);
+ memcpy(buf + ofs,
+ msg-msg_iov[i].iov_base,
+ this_time);
+ ofs += this_time;
+ remain -= this_time;
+ }
+
+ swrap_dump_packet(si, NULL, SWRAP_SEND, buf, ret);
+ free(buf);
+ if (ret == -1) {
+
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1798-g0299609
The branch, master has been updated
via 02996093088a9244c44f46818ac093430d21a99c (commit)
via c80c3b5edd231ab919b2054e22a99ba28aa11eac (commit)
via 95eeef91d3ed7daf8e19029eadcc610caf26db63 (commit)
via d402866e31b9455f8d330c0f7e3ed52cbeebcb24 (commit)
via ecdad56b6eedad4a4d8031477827c522cdf6d76e (commit)
via e15027155d3d880abde83124e252b3dd10a9aae4 (commit)
from 6ef65389fd2f2bdcafe840e0cd0221bb9f26bdfc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 02996093088a9244c44f46818ac093430d21a99c
Merge: c80c3b5edd231ab919b2054e22a99ba28aa11eac
6ef65389fd2f2bdcafe840e0cd0221bb9f26bdfc
Author: Andrew Tridgell tri...@samba.org
Date: Tue May 26 14:18:16 2009 +1000
Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit c80c3b5edd231ab919b2054e22a99ba28aa11eac
Author: Andrew Kroeger and...@id10ts.net
Date: Sun May 24 03:37:37 2009 -0500
s4:provision: Added ComPartitionSets entry.
Without this entry, opening the COM+ tab under the properties of an OU
within
ADUC results in the following error:
Unable to retrieve all user properties, 0x80072030
commit 95eeef91d3ed7daf8e19029eadcc610caf26db63
Author: Andrew Kroeger and...@id10ts.net
Date: Sun May 24 14:47:46 2009 -0500
s4:Added Extended-Rights and subentries.
Without these entries, using the 'Delegate Control' option in ADUC results
in
the following error message in the Delegation of Control Wizard:
The templates could not be applied. One or more of the templates is not
applicable. Click Back and select different templates, and then try again.
commit d402866e31b9455f8d330c0f7e3ed52cbeebcb24
Author: Andrew Kroeger and...@id10ts.net
Date: Fri May 22 00:28:36 2009 -0500
s4:provision: Update DisplaySpecifiers (#5139).
The classDisplayName attribute controls the actual text displayed to the
user
for the top-level menus, so added it to the existing entries.
The attributeDisplayNames attribute contains both the text displayed to the
user and a mapping to the internal directory attribute name for the
particular
field, so added these to the existing entries as well.
Added new entries as appropriate to properly complete all menus and labels
within ADUC.
commit ecdad56b6eedad4a4d8031477827c522cdf6d76e
Merge: e15027155d3d880abde83124e252b3dd10a9aae4
714acfac013a46c3677c3eb72ad57db6d97c7d61
Author: Andrew Tridgell tri...@samba.org
Date: Tue May 26 09:26:47 2009 +1000
Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit e15027155d3d880abde83124e252b3dd10a9aae4
Author: Andrew Tridgell tri...@samba.org
Date: Tue May 26 09:24:37 2009 +1000
added some more speed tests to tdbtool
This adds 3 simple speed tests to tdbtool, for transaction store,
store and fetch.
On my laptop this shows transactions costing about 10ms
---
Summary of changes:
lib/tdb/tools/tdbtool.c| 65 ++-
source4/setup/display_specifiers.ldif | 369
source4/setup/provision.ldif |5 +
source4/setup/provision_configuration.ldif | 881
4 files changed, 1314 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdb/tools/tdbtool.c b/lib/tdb/tools/tdbtool.c
index b4ec095..3220e47 100644
--- a/lib/tdb/tools/tdbtool.c
+++ b/lib/tdb/tools/tdbtool.c
@@ -392,15 +392,68 @@ static void speed_tdb(const char *tlimit)
{
unsigned timelimit = tlimit?atoi(tlimit):0;
double t;
- int ops=0;
- if (timelimit == 0) timelimit = 10;
+ int ops;
+ if (timelimit == 0) timelimit = 5;
+
+ ops = 0;
+ printf(Testing store speed for %u seconds\n, timelimit);
+ _start_timer();
+ do {
+ long int r = random();
+ TDB_DATA key, dbuf;
+ key.dptr = store test;
+ key.dsize = strlen(key.dptr);
+ dbuf.dptr = (unsigned char *)r;
+ dbuf.dsize = sizeof(r);
+ tdb_store(tdb, key, dbuf, TDB_REPLACE);
+ t = _end_timer();
+ ops++;
+ } while (t timelimit);
+ printf(%10.3f ops/sec\n, ops/t);
+
+ ops = 0;
+ printf(Testing fetch speed for %u seconds\n, timelimit);
+ _start_timer();
+ do {
+ long int r = random();
+ TDB_DATA key, dbuf;
+ key.dptr = store test;
+ key.dsize = strlen(key.dptr);
+ dbuf.dptr = (unsigned char *)r;
+ dbuf.dsize = sizeof(r);
+ tdb_fetch(tdb, key);
+ t = _end_timer();
+ ops++;
+ } while (t timelimit);
+ printf(%10.3f ops/sec\n, ops/t);
+
+ ops = 0;
+
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1069-gc039bc1
The branch, v3-4-test has been updated
via c039bc15ba597d955d0ccbf5642388b0a03ba40b (commit)
from 8987ca29062db53db117d6c9d9ce2ad01ed17d22 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit c039bc15ba597d955d0ccbf5642388b0a03ba40b
Author: Kai Blin k...@samba.org
Date: Thu May 14 11:39:01 2009 +0200
net: Use samba default command line arguments.
Attention:
The meaning of the -N flag changed.
To get the old meaning for net groupmap set, use the long option --ntname
The long option for using kerberos changed from --kerberos to --use-kerberos
net rpc commands will now prompt for a password if none is given.
As a benefit, net will now accept an authentication file like other samba
command line tools. So no need to specify the password on the command line
in
scripts anymore.
This should fix bug #6357
Signed-off-by: Kai Blin k...@samba.org
(cherry picked from commit fb262f79fab00374023e59476e8d05a1015a7041)
---
Summary of changes:
source3/utils/net.c | 43
source3/utils/net.h |9 +---
source3/utils/net_ads.c | 81 ++---
source3/utils/net_dom.c |8 ++-
source3/utils/net_help.c|1 +
source3/utils/net_proto.h |3 -
source3/utils/net_rpc.c | 74 +-
source3/utils/net_rpc_join.c|3 +-
source3/utils/net_rpc_samsync.c |4 +-
source3/utils/net_rpc_shell.c |9 ++-
source3/utils/net_util.c| 109 ++
11 files changed, 135 insertions(+), 209 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/net.c b/source3/utils/net.c
index d58858c..2033082 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -618,7 +618,6 @@ static struct functable net_func[] = {
int main(int argc, const char **argv)
{
int opt,i;
- char *p;
int rc = 0;
int argc_new = 0;
const char ** argv_new;
@@ -629,12 +628,10 @@ static struct functable net_func[] = {
struct poptOption long_options[] = {
{help,'h', POPT_ARG_NONE, 0, 'h'},
{workgroup, 'w', POPT_ARG_STRING, c-opt_target_workgroup},
- {user,'U', POPT_ARG_STRING, c-opt_user_name, 'U'},
{ipaddress, 'I', POPT_ARG_STRING, 0,'I'},
{port,'p', POPT_ARG_INT,c-opt_port},
{myname, 'n', POPT_ARG_STRING, c-opt_requester_name},
{server, 'S', POPT_ARG_STRING, c-opt_host},
- {encrypt, 'e', POPT_ARG_NONE, NULL, 'e', Encrypt SMB
transport (UNIX extended servers only) },
{container, 'c', POPT_ARG_STRING, c-opt_container},
{comment, 'C', POPT_ARG_STRING, c-opt_comment},
{maxusers,'M', POPT_ARG_INT,c-opt_maxusers},
@@ -645,15 +642,13 @@ static struct functable net_func[] = {
{stdin, 'i', POPT_ARG_NONE, c-opt_stdin},
{timeout, 't', POPT_ARG_INT,c-opt_timeout},
{request-timeout,0,POPT_ARG_INT,c-opt_request_timeout},
- {machine-pass,'P', POPT_ARG_NONE, c-opt_machine_pass},
- {kerberos,'k', POPT_ARG_NONE, c-opt_kerberos},
{myworkgroup, 'W', POPT_ARG_STRING, c-opt_workgroup},
{verbose, 'v', POPT_ARG_NONE, c-opt_verbose},
{test,'T', POPT_ARG_NONE, c-opt_testmode},
/* Options for 'net groupmap set' */
{local, 'L', POPT_ARG_NONE, c-opt_localgroup},
{domain, 'D', POPT_ARG_NONE, c-opt_domaingroup},
- {ntname, 'N', POPT_ARG_STRING, c-opt_newntname},
+ {ntname,0, POPT_ARG_STRING, c-opt_newntname},
{rid, 'R', POPT_ARG_INT,c-opt_rid},
/* Options for 'net rpc share migrate' */
{acls,0, POPT_ARG_NONE, c-opt_acls},
@@ -668,6 +663,7 @@ static struct functable net_func[] = {
{clean-old-entries, 0, POPT_ARG_NONE,
c-opt_clean_old_entries},
POPT_COMMON_SAMBA
+ POPT_COMMON_CREDENTIALS
{ 0, 0, 0, 0}
};
@@ -681,6 +677,13 @@ static struct functable net_func[] = {
dbf = x_stderr;
c-private_data = net_func;
+ c-auth_info = user_auth_info_init(frame);
+ if (c-auth_info == NULL) {
+ d_fprintf(stderr, \nOut of memory!\n);
+ exit(1);
+ }
+ popt_common_set_auth_info(c-auth_info);
+
pc = poptGetContext(NULL, argc, (const char **) argv, long_options,
