Rev 5381: merge from upstream - now in sync again! in http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/
At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/ revno: 5381 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Michael Adam [EMAIL PROTECTED] branch nick: SAMBA_3_0-registry.bzr timestamp: Tue 2007-06-19 11:54:01 +0200 message: merge from upstream - now in sync again! added: source/include/reg_db.hreg_db.h-20070615214610-cezf0v33opod19n3-1 source/lib/privileges_basic.c privileges_basic.c-20070614113052-vss4ipzfefw4ou23-1 source/lib/util_nttoken.c util_nttoken.c-20070614113053-yunl01g6q5iqk4rv-1 source/lib/util_reg_api.c util_reg_api.c-20070614113053-250c4n739wu542wo-1 source/lib/util_reg_smbconf.c util_reg_smbconf.c-20070614113054-hsmgsndbevshz5tg-1 renamed: source/lib/privileges_basic.c = source/lib/privileges_basic.c.moved privileges_basic.c-20070412140750-pro2zmd8rfupsdup-1 source/lib/util_nttoken.c = source/lib/util_nttoken.c.moved util_nttoken.c-20070412121956-apjs5s3igy1ydc2e-1 modified: REVISION REVISION-20060530022625-68239662668b41c3 examples/misc/adssearch.pl adssearch.pl-2006053005-0e15313921c49cc3 source/Makefile.in Makefile.in-20060530022626-b16dac2328ebe703 source/auth/auth_util.cauth_util.c-20060530022627-f9a3e5940d409fe9 source/client/smbspool.c smbspool.c-20060530022627-037d79e85d505b8b source/configure.inconfigure.in-20060530022626-07e74bc1e326c82d source/groupdb/mapping.c mapping.c-20060530022627-0d4c0d27ca093883 source/include/includes.h includes.h-20060530022627-d1a059a99c05e8be source/include/smb_macros.hsmb_macros.h-20060530022627-412e2056512de943 source/lib/charcnv.c charcnv.c-20060530022627-e157371a538fdeb6 source/lib/data_blob.c data_blob.c-20060530022627-6dbdabdd0ae85f7f source/lib/select.cselect.c-20060530022627-0a8a8f371f75ead5 source/lib/smbldap.c smbldap.c-20060530022627-2d88240b15c77135 source/lib/system.csystem.c-20060530022627-3f01435a4e07a714 source/lib/system_smbd.c system_smbd.c-20060530022627-e97a2e558e6fd98c source/lib/util.c util.c-20060530022627-d569af0e687a4dd3 source/lib/util_pw.c util_pw.c-20060530022627-912c52afc587540f source/lib/util_reg.c util_reg.c-20060711181331-c2d45d0e1f4a8648 source/lib/util_str.c util_str.c-20060530022627-0ba87cda5eaacc2e source/lib/util_tdb.c util_tdb.c-20061021025435-o3vr4t381qf9lv7e-1 source/libads/kerberos_verify.c kerberos_verify.c-20060530022627-7ce45c38ec645075 source/libads/ldap.c ldap.c-20060530022627-07f10a20cc50f671 source/libsmb/cliquota.c cliquota.c-20060530022627-6a0c6af7c7a1799b source/locking/brlock.cbrlock.c-20060530022627-3b8aec140997e136 source/locking/locking.c locking.c-20060530022627-4f229d47402340bb source/locking/posix.c posix.c-20060530022627-997d33ad43f0bd3e source/nmbd/nmbd.c nmbd.c-20060530022627-f3b08abf8f3e3c36 source/nsswitch/idmap_rid.cidmap_rid.c-20061212152807-oje7ib8mg9u2kxxg-1 source/nsswitch/winbind_nss.h winbind_nss.h-20060530022627-d0c8a4c069df06f6 source/nsswitch/winbind_nss_linux.h winbind_nss_linux.h-20060530022627-000f66c6b04b919e source/nsswitch/winbindd.c winbindd.c-20060530022627-8bb76c46bd1253ec source/nsswitch/winbindd_ads.c winbindd_ads.c-20060530022627-7c5e13eefe48f902 source/nsswitch/winbindd_cm.c winbindd_cm.c-20060530022627-54b91b1c8940d29e source/nsswitch/winbindd_group.c winbindd_group.c-20060530022627-9288f9a998ed2fbe source/nsswitch/winbindd_pam.c winbindd_pam.c-20060530022627-6b827f2f7ba30f85 source/nsswitch/winbindd_util.c winbindd_util.c-20060530022627-e014c9e53147dffe source/param/loadparm.cloadparm.c-20060530022627-1efa1edb3eb0e897 source/passdb/machine_sid.cmachine_sid.c-20060530022627-0ae56984d090a020 source/passdb/pdb_tdb.cpdb_tdb.c-20060530022627-b60f9dcd220e2886 source/registry/reg_db.c reg_db.c-20060530022627-e9a827257fb89131 source/rpc_parse/parse_misc.c parse_misc.c-20060530022627-2f2bf5c0060cbd6c source/rpc_server/srv_lsa.csrv_lsa.c-20060530022627-81cfe5eecd61a4f2 source/script/tests/test_local_s3.sh test_local_s3.sh-20060901130329-d2423dc033e3ea57 source/script/tests/test_posix_s3.sh test_posix_s3.sh-20060530100742-bf4d8804f7ab56c6 source/smbd/aio.c aio.c-20060530065353-839ba30629e9be61 source/smbd/blocking.c blocking.c-20060530022627-b43dcc35e2ddb440 source/smbd/fileio.c fileio.c-20060530022627-1404925b99a776aa source/smbd/files.cfiles.c-20060530022627-8e2ca5e2d798cd9b source/smbd/msdfs.cmsdfs.c-20060530024146-252992a3c60c990c source/smbd/negprot.c negprot.c-20060530022627-a352553cf95f9931 source/smbd/notify.c notify.c-20060530022627-f5b19ce2772c47a0
svn commit: samba r23543 - in branches: SAMBA_3_0/source/utils SAMBA_3_0_26/source/utils
Author: obnox Date: 2007-06-19 11:11:01 + (Tue, 19 Jun 2007) New Revision: 23543 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23543 Log: Adjust comments. Modified: branches/SAMBA_3_0/source/utils/net_conf.c branches/SAMBA_3_0_26/source/utils/net_conf.c Changeset: Modified: branches/SAMBA_3_0/source/utils/net_conf.c === --- branches/SAMBA_3_0/source/utils/net_conf.c 2007-06-18 21:48:57 UTC (rev 23542) +++ branches/SAMBA_3_0/source/utils/net_conf.c 2007-06-19 11:11:01 UTC (rev 23543) @@ -20,21 +20,11 @@ */ /* - * This currently only an interface to the configuration - * stored inside the samba registry. In the future there - * might be support for other configuration backends as well. + * This is an interface to the configuration stored inside the + * samba registry. In the future there might be support for other + * configuration backends as well. */ -/* - * TODO: - * - * - check uid 0 for write operations - * - check for valid parameter names and types (loadparm...) ??? - * - check for correctness of shares (service_ok) ? - * - refactor to use _internal functions for pieces of code - * - */ - #include includes.h #include utils/net.h Modified: branches/SAMBA_3_0_26/source/utils/net_conf.c === --- branches/SAMBA_3_0_26/source/utils/net_conf.c 2007-06-18 21:48:57 UTC (rev 23542) +++ branches/SAMBA_3_0_26/source/utils/net_conf.c 2007-06-19 11:11:01 UTC (rev 23543) @@ -20,21 +20,11 @@ */ /* - * This currently only an interface to the configuration - * stored inside the samba registry. In the future there - * might be support for other configuration backends as well. + * This is an interface to the configuration stored inside the + * samba registry. In the future there might be support for other + * configuration backends as well. */ -/* - * TODO: - * - * - check uid 0 for write operations - * - check for valid parameter names and types (loadparm...) ??? - * - check for correctness of shares (service_ok) ? - * - refactor to use _internal functions for pieces of code - * - */ - #include includes.h #include utils/net.h
svn commit: samba r23544 - in branches/SAMBA_3_0_RELEASE: packaging/Debian/debian-sarge packaging/Debian/debian-sarge/patches source source/auth source/client source/include source/lib source/libads s
Author: jerry Date: 2007-06-19 16:01:58 + (Tue, 19 Jun 2007) New Revision: 23544 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23544 Log: sync 3.0.25b release with SAMBA_3_0_25 svn r23530. Removed: branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-sarge/patches/undefined-symbols.patch Modified: branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-sarge/changelog branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-sarge/patches/documentation.patch branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-sarge/patches/fhs.patch branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-sarge/patches/non-linux-ports.patch branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-sarge/patches/samba.patch branches/SAMBA_3_0_RELEASE/source/Makefile.in branches/SAMBA_3_0_RELEASE/source/VERSION branches/SAMBA_3_0_RELEASE/source/auth/auth_sam.c branches/SAMBA_3_0_RELEASE/source/auth/auth_util.c branches/SAMBA_3_0_RELEASE/source/client/smbspool.c branches/SAMBA_3_0_RELEASE/source/include/ads.h branches/SAMBA_3_0_RELEASE/source/include/doserr.h branches/SAMBA_3_0_RELEASE/source/include/rpc_lsa.h branches/SAMBA_3_0_RELEASE/source/include/rpc_netlogon.h branches/SAMBA_3_0_RELEASE/source/lib/smbldap.c branches/SAMBA_3_0_RELEASE/source/lib/time.c branches/SAMBA_3_0_RELEASE/source/lib/util_str.c branches/SAMBA_3_0_RELEASE/source/libads/kerberos.c branches/SAMBA_3_0_RELEASE/source/libsmb/clifile.c branches/SAMBA_3_0_RELEASE/source/libsmb/clireadwrite.c branches/SAMBA_3_0_RELEASE/source/libsmb/doserr.c branches/SAMBA_3_0_RELEASE/source/locking/brlock.c branches/SAMBA_3_0_RELEASE/source/modules/vfs_catia.c branches/SAMBA_3_0_RELEASE/source/nmbd/nmbd_subnetdb.c branches/SAMBA_3_0_RELEASE/source/nmbd/nmbd_winsserver.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_ldap.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_nss.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_passdb.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_rid.c branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd.c branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cm.c branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_dual.c branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_misc.c branches/SAMBA_3_0_RELEASE/source/pam_smbpass/general.h branches/SAMBA_3_0_RELEASE/source/rpc_client/cli_lsarpc.c branches/SAMBA_3_0_RELEASE/source/rpc_client/cli_netlogon.c branches/SAMBA_3_0_RELEASE/source/rpc_parse/parse_lsa.c branches/SAMBA_3_0_RELEASE/source/rpc_parse/parse_net.c branches/SAMBA_3_0_RELEASE/source/rpc_parse/parse_prs.c branches/SAMBA_3_0_RELEASE/source/rpc_parse/parse_spoolss.c branches/SAMBA_3_0_RELEASE/source/rpc_server/srv_lsa_nt.c branches/SAMBA_3_0_RELEASE/source/rpcclient/cmd_netlogon.c branches/SAMBA_3_0_RELEASE/source/rpcclient/rpcclient.c branches/SAMBA_3_0_RELEASE/source/smbd/aio.c branches/SAMBA_3_0_RELEASE/source/smbd/fileio.c branches/SAMBA_3_0_RELEASE/source/smbd/notify.c branches/SAMBA_3_0_RELEASE/source/smbd/nttrans.c branches/SAMBA_3_0_RELEASE/source/smbd/open.c branches/SAMBA_3_0_RELEASE/source/smbd/reply.c branches/SAMBA_3_0_RELEASE/source/tdb/common/traverse.c branches/SAMBA_3_0_RELEASE/source/torture/denytest.c branches/SAMBA_3_0_RELEASE/source/utils/pdbedit.c Changeset: Sorry, the patch is too large (3405 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23544
svn commit: samba r23545 - in branches: SAMBA_3_0_25 SAMBA_3_0_RELEASE
Author: jerry Date: 2007-06-19 16:59:20 + (Tue, 19 Jun 2007) New Revision: 23545 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23545 Log: Update release notes for 3.0.25b. Modified: branches/SAMBA_3_0_25/WHATSNEW.txt branches/SAMBA_3_0_RELEASE/WHATSNEW.txt Changeset: Modified: branches/SAMBA_3_0_25/WHATSNEW.txt === --- branches/SAMBA_3_0_25/WHATSNEW.txt 2007-06-19 16:01:58 UTC (rev 23544) +++ branches/SAMBA_3_0_25/WHATSNEW.txt 2007-06-19 16:59:20 UTC (rev 23545) @@ -1,12 +1,112 @@ === - Release Notes for Samba 3.0.25a - May 25, 2007 + Release Notes for Samba 3.0.25b + June 20, 2007 === -This is the second production release of the Samba 3.0.25 code +This is the third production release of the Samba 3.0.25 code base and is the version that servers should be run for for all current bug fixes. +Major bug fixes included in Samba 3.0.25b are: + + o Offline caching of files with Windows XP/Vista clients. + o Improper cleanup of expired or invalid byte range locks +on files. + o Crashes is idmap_ldap and idmap_rid. + + +## +Changes +### + +Changes since 3.0.25a +- + +o Jeremy Allison [EMAIL PROTECTED] +* BUG 4655: Fix client parsing bug in spoolss EnumPrinterDataEx(). +* Ensure that proper oplock break requests occur during file open + and performing internal checks for compatible open modes. +* Fix offline file caching with Windows XP/Vista clients. +* Coverity fixes. +* Ensure that winbindd reports the correct client connection + details in response to a SIGUSR2. +* Fix timespec_current() to return the correct nano-second time. +* Fix lock logic inconsistencies in tdb_traverse(). +* Remove restriction on string length for rpcclient commands. +* BUG 4683: Fix LSA crash bug. +* BUG 3204: Fix file descriptor leak in the parent winbindd when + child processes hang. +* Avoid calling rename_open_files() when the old and new names + are identical. +* BUG 4689: Fix bug in new change notify code caused by not + ignoring the max_params_return value and as a resulting + returning truncated names. +* Fix sync_file() to return NTSTATUS and return this on failure in + the write reply path. +* BUG 4678,4697: Fix token creation for clear text logins. + + +o Jacob Berkman [EMAIL PROTECTED] +* BUG 4566: Pass password data to krb5_prompter. + + +o Guenther Deschner [EMAIL PROTECTED] +* BUG 4657: Fix compilation and linking of pam_smbpass.so. +* Add more netlogon GetDcName() client calls. + + +o Steve Langasek [EMAIL PROTECTED] +* Allow SIGTERM to cause nmbd to exit on awaiting an interface + to come up. + + +o Volker Lendecke [EMAIL PROTECTED] +* Fix record state check error when reviewing entries in nmbd's + WINS database. + + +o Justin Maggard [EMAIL PROTECTED] +* Don't expire a password if it's explicitly set as ACB_PWNOTREQ. + + +o [EMAIL PROTECTED] +* Fix old old bug in cli_smbwrite() (not incrementing data + being sent). + + +o Jens Nissen [EMAIL PROTECTED] +* BUG 4537: Fix smbtorture deny test2. + + +o James Peach [EMAIL PROTECTED] +* Fix structure types in the vfs_catia NT_ACL operations. + + +o Doug Rudoff [EMAIL PROTECTED] +* Ensure that the the lck struct for invalid locks are correctly + saved and therefore cleaned up. + + +o Simo Sorce [EMAIL PROTECTED] +* Updates for the packaging/Debian directory. +* Add missing 'c' character to the list of shell safe characters. +* BUG 4667 (partial): Fix crash bug in idmap_ldap.c. +* Fix inconsistencies between creating machine and user accounts. +* Fix bug deleting LDAP user accounts that used the account + objectclass as its structural basis. +* BUG 2319: Ensure that smbspool correctly decodes %-encoded + characters. +* BUG 4624: Fix crashes in idmap_rid. + + +Release notes for older releases follow: + + -- + === + Release Notes for Samba 3.0.25a + May 25, 2007 + === + Major bug fixes included in Samba 3.0.25a are: o Missing supplementary Unix group membership when using force @@ -54,7 +154,7 @@ about that we retry the lock every 10 seconds instead of waiting for the standard select timeout. * BUG 4637: Fix samlogon reply regression that broke domain logons. -* Fix rename on open files and improved cdelete-on-close semantics. +* Fix rename
svn commit: samba r23546 - in branches/SAMBA_3_0_25/source: .
Author: jerry Date: 2007-06-19 16:59:51 + (Tue, 19 Jun 2007) New Revision: 23546 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23546 Log: this is now 3.0.25c Modified: branches/SAMBA_3_0_25/source/VERSION Changeset: Modified: branches/SAMBA_3_0_25/source/VERSION === --- branches/SAMBA_3_0_25/source/VERSION2007-06-19 16:59:20 UTC (rev 23545) +++ branches/SAMBA_3_0_25/source/VERSION2007-06-19 16:59:51 UTC (rev 23546) @@ -36,7 +36,7 @@ # e.g. SAMBA_VERSION_REVISION=a# # - 2.2.8a# -SAMBA_VERSION_REVISION=b +SAMBA_VERSION_REVISION=c # For 'pre' releases the version will be #
svn commit: samba-docs r1126 - in tags: .
Author: jerry Date: 2007-06-19 17:17:37 + (Tue, 19 Jun 2007) New Revision: 1126 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1126 Log: tagging 3.0.25b Added: tags/release-3-0-25b/ Changeset: Copied: tags/release-3-0-25b (from rev 1125, trunk)
svn commit: samba r23547 - in branches: SAMBA_3_0/source/param SAMBA_3_0_26/source/param
Author: obnox
Date: 2007-06-19 21:06:31 + (Tue, 19 Jun 2007)
New Revision: 23547
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23547
Log:
Ignore parameter include in regsitry globals.
Michael
Modified:
branches/SAMBA_3_0/source/param/loadparm.c
branches/SAMBA_3_0_26/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===
--- branches/SAMBA_3_0/source/param/loadparm.c 2007-06-19 16:59:51 UTC (rev
23546)
+++ branches/SAMBA_3_0/source/param/loadparm.c 2007-06-19 21:06:31 UTC (rev
23547)
@@ -3163,6 +3163,11 @@
type,
size,
data_p);
+ if (strcmp(valname,include)) {
+ DEBUG(10, (process_registry_globals: Ignoring
+ parameter 'include' in registry.\n));
+ continue;
+ }
DEBUG(10, (process_registry_shares: got value '%s'\n,
valname));
if (size data_p) {
Modified: branches/SAMBA_3_0_26/source/param/loadparm.c
===
--- branches/SAMBA_3_0_26/source/param/loadparm.c 2007-06-19 16:59:51 UTC
(rev 23546)
+++ branches/SAMBA_3_0_26/source/param/loadparm.c 2007-06-19 21:06:31 UTC
(rev 23547)
@@ -3164,6 +3164,11 @@
type,
size,
data_p);
+ if (strcmp(valname,include)) {
+ DEBUG(10, (process_registry_globals: Ignoring
+ parameter 'include' in registry.\n));
+ continue;
+ }
DEBUG(10, (process_registry_shares: got value '%s'\n,
valname));
if (size data_p) {
svn commit: samba r23548 - in branches: SAMBA_3_0/source/param SAMBA_3_0_26/source/param
Author: obnox
Date: 2007-06-19 21:08:46 + (Tue, 19 Jun 2007)
New Revision: 23548
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23548
Log:
Fix comments.
Michael
Modified:
branches/SAMBA_3_0/source/param/loadparm.c
branches/SAMBA_3_0_26/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===
--- branches/SAMBA_3_0/source/param/loadparm.c 2007-06-19 21:06:31 UTC (rev
23547)
+++ branches/SAMBA_3_0/source/param/loadparm.c 2007-06-19 21:08:46 UTC (rev
23548)
@@ -3136,7 +3136,7 @@
KEY_SMBCONF, GLOBAL_NAME);
normalize_dbkey(keystr);
- DEBUG(10, (process_registry_shares: fetching key '%s'\n,
+ DEBUG(10, (process_registry_globals: fetching key '%s'\n,
keystr));
data = tdb_fetch_bystring(reg_tdb-tdb, keystr);
@@ -3150,7 +3150,7 @@
/* unpack number of values */
len = tdb_unpack(buf, buflen, d, num_values);
- DEBUG(10, (process_registry_shares: got %d values from tdb\n,
+ DEBUG(10, (process_registry_globals: got %d values from tdb\n,
num_values));
/* unpack the values */
@@ -3168,7 +3168,7 @@
parameter 'include' in registry.\n));
continue;
}
- DEBUG(10, (process_registry_shares: got value '%s'\n,
+ DEBUG(10, (process_registry_globals: got value '%s'\n,
valname));
if (size data_p) {
err = registry_pull_value(reg_tdb,
Modified: branches/SAMBA_3_0_26/source/param/loadparm.c
===
--- branches/SAMBA_3_0_26/source/param/loadparm.c 2007-06-19 21:06:31 UTC
(rev 23547)
+++ branches/SAMBA_3_0_26/source/param/loadparm.c 2007-06-19 21:08:46 UTC
(rev 23548)
@@ -3137,7 +3137,7 @@
KEY_SMBCONF, GLOBAL_NAME);
normalize_dbkey(keystr);
- DEBUG(10, (process_registry_shares: fetching key '%s'\n,
+ DEBUG(10, (process_registry_globals: fetching key '%s'\n,
keystr));
data = tdb_fetch_bystring(reg_tdb-tdb, keystr);
@@ -3151,7 +3151,7 @@
/* unpack number of values */
len = tdb_unpack(buf, buflen, d, num_values);
- DEBUG(10, (process_registry_shares: got %d values from tdb\n,
+ DEBUG(10, (process_registry_globals: got %d values from tdb\n,
num_values));
/* unpack the values */
@@ -3169,7 +3169,7 @@
parameter 'include' in registry.\n));
continue;
}
- DEBUG(10, (process_registry_shares: got value '%s'\n,
+ DEBUG(10, (process_registry_globals: got value '%s'\n,
valname));
if (size data_p) {
err = registry_pull_value(reg_tdb,
svn commit: samba r23549 - in branches: SAMBA_3_0/source/utils SAMBA_3_0_26/source/utils
Author: obnox
Date: 2007-06-19 21:40:27 + (Tue, 19 Jun 2007)
New Revision: 23549
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23549
Log:
Make net conf setparm always use registry data type sz.
This simplifies the usage of this command from
net conf setparm section param type value
to
net conf setparm section param value.
Micheal
Modified:
branches/SAMBA_3_0/source/utils/net_conf.c
branches/SAMBA_3_0_26/source/utils/net_conf.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_conf.c
===
--- branches/SAMBA_3_0/source/utils/net_conf.c 2007-06-19 21:08:46 UTC (rev
23548)
+++ branches/SAMBA_3_0/source/utils/net_conf.c 2007-06-19 21:40:27 UTC (rev
23549)
@@ -82,8 +82,7 @@
static int net_conf_setparm_usage(int argc, const char **argv)
{
- d_printf(USAGE: net conf setparm section param type value\n
-\t(Supported types are 'dword' and 'sz' by now.)\n);
+ d_printf(USAGE: net conf setparm section param value\n);
return -1;
}
@@ -918,20 +917,18 @@
struct registry_key *key = NULL;
char *service = NULL;
char *param = NULL;
- char *type = NULL;
const char *value_str = NULL;
TALLOC_CTX *ctx;
ctx = talloc_init(setparm);
- if (argc != 4) {
+ if (argc != 3) {
net_conf_setparm_usage(argc, argv);
goto done;
}
service = strdup_lower(argv[0]);
param = strdup_lower(argv[1]);
- type = strdup_lower(argv[2]);
- value_str = argv[3];
+ value_str = argv[2];
if (!smbconf_key_exists(ctx, service)) {
werr = reg_createkey_internal(ctx, service, key);
@@ -943,7 +940,7 @@
goto done;
}
- werr = reg_setvalue_internal(key, param, type, value_str);
+ werr = reg_setvalue_internal(key, param, sz, value_str);
if (!W_ERROR_IS_OK(werr)) {
d_fprintf(stderr, Error setting value '%s': %s\n,
param, dos_errstr(werr));
Modified: branches/SAMBA_3_0_26/source/utils/net_conf.c
===
--- branches/SAMBA_3_0_26/source/utils/net_conf.c 2007-06-19 21:08:46 UTC
(rev 23548)
+++ branches/SAMBA_3_0_26/source/utils/net_conf.c 2007-06-19 21:40:27 UTC
(rev 23549)
@@ -82,8 +82,7 @@
static int net_conf_setparm_usage(int argc, const char **argv)
{
- d_printf(USAGE: net conf setparm section param type value\n
-\t(Supported types are 'dword' and 'sz' by now.)\n);
+ d_printf(USAGE: net conf setparm section param value\n);
return -1;
}
@@ -918,20 +917,18 @@
struct registry_key *key = NULL;
char *service = NULL;
char *param = NULL;
- char *type = NULL;
const char *value_str = NULL;
TALLOC_CTX *ctx;
ctx = talloc_init(setparm);
- if (argc != 4) {
+ if (argc != 3) {
net_conf_setparm_usage(argc, argv);
goto done;
}
service = strdup_lower(argv[0]);
param = strdup_lower(argv[1]);
- type = strdup_lower(argv[2]);
- value_str = argv[3];
+ value_str = argv[2];
if (!smbconf_key_exists(ctx, service)) {
werr = reg_createkey_internal(ctx, service, key);
@@ -943,7 +940,7 @@
goto done;
}
- werr = reg_setvalue_internal(key, param, type, value_str);
+ werr = reg_setvalue_internal(key, param, sz, value_str);
if (!W_ERROR_IS_OK(werr)) {
d_fprintf(stderr, Error setting value '%s': %s\n,
param, dos_errstr(werr));
Build status as of Wed Jun 20 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-06-19 00:00:23.0 + +++ /home/build/master/cache/broken_results.txt 2007-06-20 00:00:23.0 + @@ -1,4 +1,4 @@ -Build status as of Tue Jun 19 00:00:01 2007 +Build status as of Wed Jun 20 00:00:02 2007 Build counts: Tree Total Broken Panic @@ -9,17 +9,17 @@ distcc 2 0 0 ldb 35 3 0 libreplace 33 9 0 -lorikeet-heimdal 31 23 0 +lorikeet-heimdal 31 17 0 pidl 20 4 0 -ppp 15 0 0 +ppp 15 8 0 python 0 0 0 rsync36 10 0 samba0 0 0 samba-docs 0 0 0 samba-gtk4 4 0 -samba4 33 21 12 -samba_3_035 18 0 +samba4 32 22 12 +samba_3_036 17 0 smb-build33 33 0 talloc 36 8 0 -tdb 35 2 0 +tdb 34 2 0
svn commit: samba r23550 - in branches: SAMBA_3_0/source/lib SAMBA_3_0_25/source/libsmb SAMBA_3_0_26/source/lib
Author: jra
Date: 2007-06-20 01:26:18 + (Wed, 20 Jun 2007)
New Revision: 23550
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23550
Log:
Add more UNIX error - NT status mappings.
Jeremy.
Modified:
branches/SAMBA_3_0/source/lib/errmap_unix.c
branches/SAMBA_3_0_25/source/libsmb/errormap.c
branches/SAMBA_3_0_26/source/lib/errmap_unix.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/errmap_unix.c
===
--- branches/SAMBA_3_0/source/lib/errmap_unix.c 2007-06-19 21:40:27 UTC (rev
23549)
+++ branches/SAMBA_3_0/source/lib/errmap_unix.c 2007-06-20 01:26:18 UTC (rev
23550)
@@ -63,9 +63,34 @@
{ ENOBUFS, ERRDOS, ERRnomem, NT_STATUS_INSUFFICIENT_RESOURCES },
#endif
{ EAGAIN, ERRDOS, 111, NT_STATUS_NETWORK_BUSY },
+#ifdef EADDRINUSE
+ { EADDRINUSE, ERRDOS, 52, NT_STATUS_ADDRESS_ALREADY_ASSOCIATED},
+#endif
+#ifdef ENETUNREACH
+ { ENETUNREACH, ERRHRD, ERRgeneral, NT_STATUS_NETWORK_UNREACHABLE},
+#endif
+#ifdef EHOSTUNREACH
+ { EHOSTUNREACH, ERRHRD, ERRgeneral, NT_STATUS_HOST_UNREACHABLE},
+#endif
+#ifdef ECONNREFUSED
+ { ECONNREFUSED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_REFUSED},
+#endif
+#ifdef ETIMEDOUT
+ { ETIMEDOUT, ERRHRD, 121, NT_STATUS_IO_TIMEOUT},
+#endif
+#ifdef ECONNABORTED
+ { ECONNABORTED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_ABORTED},
+#endif
+#ifdef ENODEV
+ { ENODEV, ERRDOS, 55, NT_STATUS_DEVICE_DOES_NOT_EXIST},
+#endif
+#ifdef EPIPE
+ { EPIPE, ERRDOS, 109, NT_STATUS_PIPE_BROKEN},
+#endif
#ifdef EWOULDBLOCK
{ EWOULDBLOCK, ERRDOS, 111, NT_STATUS_NETWORK_BUSY },
#endif
+
{ 0, 0, 0, NT_STATUS_OK }
};
Modified: branches/SAMBA_3_0_25/source/libsmb/errormap.c
===
--- branches/SAMBA_3_0_25/source/libsmb/errormap.c 2007-06-19 21:40:27 UTC
(rev 23549)
+++ branches/SAMBA_3_0_25/source/libsmb/errormap.c 2007-06-20 01:26:18 UTC
(rev 23550)
@@ -1542,6 +1542,34 @@
#ifdef ENOBUFS
{ ENOBUFS, ERRDOS, ERRnomem, NT_STATUS_INSUFFICIENT_RESOURCES },
#endif
+ { EAGAIN, ERRDOS, 111, NT_STATUS_NETWORK_BUSY },
+#ifdef EADDRINUSE
+ { EADDRINUSE, ERRDOS, 52, NT_STATUS_ADDRESS_ALREADY_ASSOCIATED},
+#endif
+#ifdef ENETUNREACH
+ { ENETUNREACH, ERRHRD, ERRgeneral, NT_STATUS_NETWORK_UNREACHABLE},
+#endif
+#ifdef EHOSTUNREACH
+ { EHOSTUNREACH, ERRHRD, ERRgeneral, NT_STATUS_HOST_UNREACHABLE},
+#endif
+#ifdef ECONNREFUSED
+ { ECONNREFUSED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_REFUSED},
+#endif
+#ifdef ETIMEDOUT
+ { ETIMEDOUT, ERRHRD, 121, NT_STATUS_IO_TIMEOUT},
+#endif
+#ifdef ECONNABORTED
+ { ECONNABORTED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_ABORTED},
+#endif
+#ifdef ENODEV
+ { ENODEV, ERRDOS, 55, NT_STATUS_DEVICE_DOES_NOT_EXIST},
+#endif
+#ifdef EPIPE
+ {EPIPE, ERRDOS, 109, NT_STATUS_PIPE_BROKEN},
+#endif
+#ifdef EWOULDBLOCK
+ { EWOULDBLOCK, ERRDOS, 111, NT_STATUS_NETWORK_BUSY },
+#endif
{ 0, 0, 0, NT_STATUS_OK }
};
Modified: branches/SAMBA_3_0_26/source/lib/errmap_unix.c
===
--- branches/SAMBA_3_0_26/source/lib/errmap_unix.c 2007-06-19 21:40:27 UTC
(rev 23549)
+++ branches/SAMBA_3_0_26/source/lib/errmap_unix.c 2007-06-20 01:26:18 UTC
(rev 23550)
@@ -63,9 +63,34 @@
{ ENOBUFS, ERRDOS, ERRnomem, NT_STATUS_INSUFFICIENT_RESOURCES },
#endif
{ EAGAIN, ERRDOS, 111, NT_STATUS_NETWORK_BUSY },
+#ifdef EADDRINUSE
+ { EADDRINUSE, ERRDOS, 52, NT_STATUS_ADDRESS_ALREADY_ASSOCIATED},
+#endif
+#ifdef ENETUNREACH
+ { ENETUNREACH, ERRHRD, ERRgeneral, NT_STATUS_NETWORK_UNREACHABLE},
+#endif
+#ifdef EHOSTUNREACH
+ { EHOSTUNREACH, ERRHRD, ERRgeneral, NT_STATUS_HOST_UNREACHABLE},
+#endif
+#ifdef ECONNREFUSED
+ { ECONNREFUSED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_REFUSED},
+#endif
+#ifdef ETIMEDOUT
+ { ETIMEDOUT, ERRHRD, 121, NT_STATUS_IO_TIMEOUT},
+#endif
+#ifdef ECONNABORTED
+ { ECONNABORTED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_ABORTED},
+#endif
+#ifdef ENODEV
+ { ENODEV, ERRDOS, 55, NT_STATUS_DEVICE_DOES_NOT_EXIST},
+#endif
+#ifdef EPIPE
+ { EPIPE, ERRDOS, 109, NT_STATUS_PIPE_BROKEN},
+#endif
#ifdef EWOULDBLOCK
{ EWOULDBLOCK, ERRDOS, 111, NT_STATUS_NETWORK_BUSY },
#endif
+
{ 0, 0, 0, NT_STATUS_OK }
};
svn commit: samba r23551 - in branches/SAMBA_4_0/source: lib/registry lib/util librpc/rpc rpc_server/epmapper torture/basic
Author: abartlet
Date: 2007-06-20 04:15:39 + (Wed, 20 Jun 2007)
New Revision: 23551
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23551
Log:
Change data_blob_equal to data_blob_cmp, suitable for sorting with qsort().
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/lib/registry/patchfile.c
branches/SAMBA_4_0/source/lib/util/data_blob.c
branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c
branches/SAMBA_4_0/source/rpc_server/epmapper/rpc_epmapper.c
branches/SAMBA_4_0/source/torture/basic/aliases.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/registry/patchfile.c
===
--- branches/SAMBA_4_0/source/lib/registry/patchfile.c 2007-06-20 01:26:18 UTC
(rev 23550)
+++ branches/SAMBA_4_0/source/lib/registry/patchfile.c 2007-06-20 04:15:39 UTC
(rev 23551)
@@ -125,7 +125,7 @@
return error2;
}
- if (W_ERROR_IS_OK(error2) data_blob_equal(v1-data,
v2-data))
+ if (W_ERROR_IS_OK(error2) data_blob_cmp(v1-data,
v2-data) == 0)
continue;
thiskey = diff_find_add_key(diff, oldkey-path);
Modified: branches/SAMBA_4_0/source/lib/util/data_blob.c
===
--- branches/SAMBA_4_0/source/lib/util/data_blob.c 2007-06-20 01:26:18 UTC
(rev 23550)
+++ branches/SAMBA_4_0/source/lib/util/data_blob.c 2007-06-20 04:15:39 UTC
(rev 23551)
@@ -130,21 +130,23 @@
/**
check if two data blobs are equal
**/
-_PUBLIC_ BOOL data_blob_equal(const DATA_BLOB *d1, const DATA_BLOB *d2)
+_PUBLIC_ int data_blob_cmp(const DATA_BLOB *d1, const DATA_BLOB *d2)
{
- if (d1-length != d2-length) {
- return False;
+ int ret;
+ if (d1-data == NULL d2-data != NULL) {
+ return -1;
}
+ if (d1-data != NULL d2-data == NULL) {
+ return 1;
+ }
if (d1-data == d2-data) {
- return True;
+ return d1-length - d2-length;
}
- if (d1-data == NULL || d2-data == NULL) {
- return False;
+ ret = memcmp(d1-data, d2-data, MIN(d1-length, d2-length));
+ if (ret == 0) {
+ return d1-length - d2-length;
}
- if (memcmp(d1-data, d2-data, d1-length) == 0) {
- return True;
- }
- return False;
+ return ret;
}
/**
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c
===
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c 2007-06-20 01:26:18 UTC
(rev 23550)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c 2007-06-20 04:15:39 UTC
(rev 23551)
@@ -1193,7 +1193,7 @@
blob2 = ndr_push_blob(push);
- if (!data_blob_equal(blob, blob2)) {
+ if (data_blob_cmp(blob, blob2) != 0) {
DEBUG(3,(original:\n));
dump_data(3, blob.data, blob.length);
DEBUG(3,(secondary:\n));
@@ -1276,7 +1276,7 @@
blob2 = ndr_push_blob(push);
- if (!data_blob_equal(blob, blob2)) {
+ if (data_blob_cmp(blob, blob2) != 0) {
DEBUG(3,(original:\n));
dump_data(3, blob.data, blob.length);
DEBUG(3,(secondary:\n));
Modified: branches/SAMBA_4_0/source/rpc_server/epmapper/rpc_epmapper.c
===
--- branches/SAMBA_4_0/source/rpc_server/epmapper/rpc_epmapper.c
2007-06-20 01:26:18 UTC (rev 23550)
+++ branches/SAMBA_4_0/source/rpc_server/epmapper/rpc_epmapper.c
2007-06-20 04:15:39 UTC (rev 23551)
@@ -218,8 +218,8 @@
for (i=0;icount;i++) {
if (
-
!data_blob_equal(r-in.map_tower-tower.floors[0].lhs.lhs_data,
- eps[i].ep.floors[0].lhs.lhs_data)
+
data_blob_cmp(r-in.map_tower-tower.floors[0].lhs.lhs_data,
+ eps[i].ep.floors[0].lhs.lhs_data) != 0
|| transport != dcerpc_transport_by_tower(eps[i].ep)) {
continue;
}
Modified: branches/SAMBA_4_0/source/torture/basic/aliases.c
===
--- branches/SAMBA_4_0/source/torture/basic/aliases.c 2007-06-20 01:26:18 UTC
(rev 23550)
+++ branches/SAMBA_4_0/source/torture/basic/aliases.c 2007-06-20 04:15:39 UTC
(rev 23551)
@@ -68,8 +68,8 @@
for (t2b=alias_blobs; t2b; t2b=t2b-next) {
for (t2b2=alias_blobs; t2b2; t2b2=t2b2-next) {
if (t2b-level = t2b2-level) continue;
- if (data_blob_equal(t2b-params, t2b2-params)
- data_blob_equal(t2b-data, t2b2-data)) {
+ if (data_blob_cmp(t2b-params, t2b2-params) == 0
+
