svn commit: samba r23755 - in branches: SAMBA_3_0/source/locking SAMBA_3_0_26/source/locking
Author: vlendec
Date: 2007-07-09 07:51:39 + (Mon, 09 Jul 2007)
New Revision: 23755
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23755
Log:
Fix Coverity id 384
Modified:
branches/SAMBA_3_0/source/locking/brlock.c
branches/SAMBA_3_0_26/source/locking/brlock.c
Changeset:
Modified: branches/SAMBA_3_0/source/locking/brlock.c
===
--- branches/SAMBA_3_0/source/locking/brlock.c 2007-07-09 03:08:20 UTC (rev
23754)
+++ branches/SAMBA_3_0/source/locking/brlock.c 2007-07-09 07:51:39 UTC (rev
23755)
@@ -1642,7 +1642,13 @@
talloc_set_destructor(br_lck, byte_range_lock_destructor);
br_lck-num_locks = data.dsize / sizeof(struct lock_struct);
- br_lck-lock_data = SMB_MALLOC_ARRAY(struct lock_struct,
br_lck-num_locks);
+ if (!(br_lck-lock_data = SMB_MALLOC_ARRAY(
+ struct lock_struct, br_lck-num_locks))) {
+ DEBUG(0, (malloc failed\n));
+ TALLOC_FREE(br_lck);
+ return NULL;
+ }
+
memcpy(br_lck-lock_data, data.dptr, data.dsize);
if (!fsp-lockdb_clean) {
Modified: branches/SAMBA_3_0_26/source/locking/brlock.c
===
--- branches/SAMBA_3_0_26/source/locking/brlock.c 2007-07-09 03:08:20 UTC
(rev 23754)
+++ branches/SAMBA_3_0_26/source/locking/brlock.c 2007-07-09 07:51:39 UTC
(rev 23755)
@@ -1642,7 +1642,13 @@
talloc_set_destructor(br_lck, byte_range_lock_destructor);
br_lck-num_locks = data.dsize / sizeof(struct lock_struct);
- br_lck-lock_data = SMB_MALLOC_ARRAY(struct lock_struct,
br_lck-num_locks);
+ if (!(br_lck-lock_data = SMB_MALLOC_ARRAY(
+ struct lock_struct, br_lck-num_locks))) {
+ DEBUG(0, (malloc failed\n));
+ TALLOC_FREE(br_lck);
+ return NULL;
+ }
+
memcpy(br_lck-lock_data, data.dptr, data.dsize);
if (!fsp-lockdb_clean) {
svn commit: samba r23756 - in branches: SAMBA_3_0/source/lib SAMBA_3_0_26/source/lib
Author: vlendec
Date: 2007-07-09 07:55:09 + (Mon, 09 Jul 2007)
New Revision: 23756
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23756
Log:
Fix Coverity id 388
Modified:
branches/SAMBA_3_0/source/lib/util_reg_api.c
branches/SAMBA_3_0_26/source/lib/util_reg_api.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/util_reg_api.c
===
--- branches/SAMBA_3_0/source/lib/util_reg_api.c2007-07-09 07:51:39 UTC
(rev 23755)
+++ branches/SAMBA_3_0/source/lib/util_reg_api.c2007-07-09 07:55:09 UTC
(rev 23756)
@@ -82,6 +82,7 @@
if (length + 2 length) {
/* Integer wrap. */
+ SAFE_FREE(tmp);
err = WERR_INVALID_PARAM;
goto error;
}
Modified: branches/SAMBA_3_0_26/source/lib/util_reg_api.c
===
--- branches/SAMBA_3_0_26/source/lib/util_reg_api.c 2007-07-09 07:51:39 UTC
(rev 23755)
+++ branches/SAMBA_3_0_26/source/lib/util_reg_api.c 2007-07-09 07:55:09 UTC
(rev 23756)
@@ -82,6 +82,7 @@
if (length + 2 length) {
/* Integer wrap. */
+ SAFE_FREE(tmp);
err = WERR_INVALID_PARAM;
goto error;
}
svn commit: samba r23757 - in branches: SAMBA_3_0/source/utils SAMBA_3_0_26/source/utils
Author: vlendec
Date: 2007-07-09 08:00:50 + (Mon, 09 Jul 2007)
New Revision: 23757
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23757
Log:
Fix Coverity id 386
Modified:
branches/SAMBA_3_0/source/utils/net_rpc.c
branches/SAMBA_3_0_26/source/utils/net_rpc.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_rpc.c
===
--- branches/SAMBA_3_0/source/utils/net_rpc.c 2007-07-09 07:55:09 UTC (rev
23756)
+++ branches/SAMBA_3_0/source/utils/net_rpc.c 2007-07-09 08:00:50 UTC (rev
23757)
@@ -4074,7 +4074,11 @@
{
token-num_sids = 4;
- token-user_sids = SMB_MALLOC_ARRAY(DOM_SID, 4);
+ if (!(token-user_sids = SMB_MALLOC_ARRAY(DOM_SID, 4))) {
+ d_fprintf(stderr, malloc failed\n);
+ token-num_sids = 0;
+ return;
+ }
token-user_sids[0] = *user_sid;
sid_copy(token-user_sids[1], global_sid_World);
Modified: branches/SAMBA_3_0_26/source/utils/net_rpc.c
===
--- branches/SAMBA_3_0_26/source/utils/net_rpc.c2007-07-09 07:55:09 UTC
(rev 23756)
+++ branches/SAMBA_3_0_26/source/utils/net_rpc.c2007-07-09 08:00:50 UTC
(rev 23757)
@@ -4163,7 +4163,11 @@
{
token-num_sids = 4;
- token-user_sids = SMB_MALLOC_ARRAY(DOM_SID, 4);
+ if (!(token-user_sids = SMB_MALLOC_ARRAY(DOM_SID, 4))) {
+ d_fprintf(stderr, malloc failed\n);
+ token-num_sids = 0;
+ return;
+ }
token-user_sids[0] = *user_sid;
sid_copy(token-user_sids[1], global_sid_World);
svn commit: samba r23758 - in branches: SAMBA_3_0/source/rpc_server SAMBA_3_0_26/source/rpc_server
Author: vlendec
Date: 2007-07-09 08:04:43 + (Mon, 09 Jul 2007)
New Revision: 23758
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23758
Log:
Fix Coverity id 385
Modified:
branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c
branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c
===
--- branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c 2007-07-09
08:00:50 UTC (rev 23757)
+++ branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c 2007-07-09
08:04:43 UTC (rev 23758)
@@ -7490,8 +7490,13 @@
/* if no hook then just fill in the default port */
if ( !*cmd ) {
- qlines = SMB_MALLOC_ARRAY( char*, 2 );
- qlines[0] = SMB_STRDUP( SAMBA_PRINTER_PORT_NAME );
+ if (!(qlines = SMB_MALLOC_ARRAY( char*, 2 ))) {
+ return WERR_NOMEM;
+ }
+ if (!(qlines[0] = SMB_STRDUP( SAMBA_PRINTER_PORT_NAME ))) {
+ SAFE_FREE(qlines);
+ return WERR_NOMEM;
+ }
qlines[1] = NULL;
numlines = 1;
}
Modified: branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c
===
--- branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c2007-07-09
08:00:50 UTC (rev 23757)
+++ branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c2007-07-09
08:04:43 UTC (rev 23758)
@@ -7403,8 +7403,13 @@
/* if no hook then just fill in the default port */
if ( !*cmd ) {
- qlines = SMB_MALLOC_ARRAY( char*, 2 );
- qlines[0] = SMB_STRDUP( SAMBA_PRINTER_PORT_NAME );
+ if (!(qlines = SMB_MALLOC_ARRAY( char*, 2 ))) {
+ return WERR_NOMEM;
+ }
+ if (!(qlines[0] = SMB_STRDUP( SAMBA_PRINTER_PORT_NAME ))) {
+ SAFE_FREE(qlines);
+ return WERR_NOMEM;
+ }
qlines[1] = NULL;
numlines = 1;
}
svn commit: samba r23759 - in branches: SAMBA_3_0/source/locking SAMBA_3_0_26/source/locking
Author: vlendec
Date: 2007-07-09 08:45:14 + (Mon, 09 Jul 2007)
New Revision: 23759
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23759
Log:
Fix make test -- sorry
Modified:
branches/SAMBA_3_0/source/locking/brlock.c
branches/SAMBA_3_0_26/source/locking/brlock.c
Changeset:
Modified: branches/SAMBA_3_0/source/locking/brlock.c
===
--- branches/SAMBA_3_0/source/locking/brlock.c 2007-07-09 08:04:43 UTC (rev
23758)
+++ branches/SAMBA_3_0/source/locking/brlock.c 2007-07-09 08:45:14 UTC (rev
23759)
@@ -1642,8 +1642,8 @@
talloc_set_destructor(br_lck, byte_range_lock_destructor);
br_lck-num_locks = data.dsize / sizeof(struct lock_struct);
- if (!(br_lck-lock_data = SMB_MALLOC_ARRAY(
- struct lock_struct, br_lck-num_locks))) {
+ br_lck-lock_data = SMB_MALLOC_ARRAY(struct lock_struct,
br_lck-num_locks);
+ if ((br_lck-num_locks != 0) (br_lck-lock_data == NULL)) {
DEBUG(0, (malloc failed\n));
TALLOC_FREE(br_lck);
return NULL;
Modified: branches/SAMBA_3_0_26/source/locking/brlock.c
===
--- branches/SAMBA_3_0_26/source/locking/brlock.c 2007-07-09 08:04:43 UTC
(rev 23758)
+++ branches/SAMBA_3_0_26/source/locking/brlock.c 2007-07-09 08:45:14 UTC
(rev 23759)
@@ -1642,8 +1642,8 @@
talloc_set_destructor(br_lck, byte_range_lock_destructor);
br_lck-num_locks = data.dsize / sizeof(struct lock_struct);
- if (!(br_lck-lock_data = SMB_MALLOC_ARRAY(
- struct lock_struct, br_lck-num_locks))) {
+ br_lck-lock_data = SMB_MALLOC_ARRAY(struct lock_struct,
br_lck-num_locks);
+ if ((br_lck-num_locks != 0) (br_lck-lock_data == NULL)) {
DEBUG(0, (malloc failed\n));
TALLOC_FREE(br_lck);
return NULL;
svn commit: samba r23760 - in branches: SAMBA_3_0/source/utils SAMBA_3_0_26/source/utils
Author: obnox
Date: 2007-07-09 09:35:03 + (Mon, 09 Jul 2007)
New Revision: 23760
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23760
Log:
Untangle use of strrchr_m and strequal and add some checks
for the validity of the given registry key name.
Michael
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-07-09 08:45:14 UTC (rev
23759)
+++ branches/SAMBA_3_0/source/utils/net_conf.c 2007-07-09 09:35:03 UTC (rev
23760)
@@ -151,6 +151,7 @@
{
struct registry_value val;
WERROR werr = WERR_OK;
+ char *subkeyname;
ZERO_STRUCT(val);
@@ -171,12 +172,20 @@
goto done;
}
- if (!strequal(strrchr_m(key-key-name, '\\')+1, GLOBAL_NAME)
+ subkeyname = strrchr_m(key-key-name, '\\');
+ if ((subkeyname == NULL) || (*(subkeyname +1) == '\0')) {
+ d_fprintf(stderr, Invalid registry key '%s' given as
+ smbconf section.\n, key-key-name);
+ werr = WERR_INVALID_PARAM;
+ goto done;
+ }
+ subkeyname++;
+ if (!strequal(subkeyname, GLOBAL_NAME)
lp_parameter_is_global(valname))
{
d_fprintf(stderr, Global paramter '%s' not allowed in
service definition ('%s').\n, valname,
- strrchr_m(key-key-name, '\\')+1);
+ subkeyname);
werr = WERR_INVALID_PARAM;
goto done;
}
Modified: branches/SAMBA_3_0_26/source/utils/net_conf.c
===
--- branches/SAMBA_3_0_26/source/utils/net_conf.c 2007-07-09 08:45:14 UTC
(rev 23759)
+++ branches/SAMBA_3_0_26/source/utils/net_conf.c 2007-07-09 09:35:03 UTC
(rev 23760)
@@ -151,6 +151,7 @@
{
struct registry_value val;
WERROR werr = WERR_OK;
+ char *subkeyname;
ZERO_STRUCT(val);
@@ -171,12 +172,20 @@
goto done;
}
- if (!strequal(strrchr_m(key-key-name, '\\')+1, GLOBAL_NAME)
+ subkeyname = strrchr_m(key-key-name, '\\');
+ if ((subkeyname == NULL) || (*(subkeyname +1) == '\0')) {
+ d_fprintf(stderr, Invalid registry key '%s' given as
+ smbconf section.\n, key-key-name);
+ werr = WERR_INVALID_PARAM;
+ goto done;
+ }
+ subkeyname++;
+ if (!strequal(subkeyname, GLOBAL_NAME)
lp_parameter_is_global(valname))
{
d_fprintf(stderr, Global paramter '%s' not allowed in
service definition ('%s').\n, valname,
- strrchr_m(key-key-name, '\\')+1);
+ subkeyname);
werr = WERR_INVALID_PARAM;
goto done;
}
svn commit: samba r23761 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_26/source/smbd
Author: vlendec
Date: 2007-07-09 09:43:41 + (Mon, 09 Jul 2007)
New Revision: 23761
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23761
Log:
Rename reduce_name to check_reduced_name
The function name reduce_name is misleading, making the user believe it
changes an argument.
Modified:
branches/SAMBA_3_0/source/smbd/filename.c
branches/SAMBA_3_0/source/smbd/nttrans.c
branches/SAMBA_3_0/source/smbd/trans2.c
branches/SAMBA_3_0/source/smbd/vfs.c
branches/SAMBA_3_0_26/source/smbd/filename.c
branches/SAMBA_3_0_26/source/smbd/nttrans.c
branches/SAMBA_3_0_26/source/smbd/trans2.c
branches/SAMBA_3_0_26/source/smbd/vfs.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/filename.c
===
--- branches/SAMBA_3_0/source/smbd/filename.c 2007-07-09 09:35:03 UTC (rev
23760)
+++ branches/SAMBA_3_0/source/smbd/filename.c 2007-07-09 09:43:41 UTC (rev
23761)
@@ -512,7 +512,7 @@
}
/
- Check a filename - possibly caling reducename.
+ Check a filename - possibly calling check_reduced_name.
This is called by every routine before it allows an operation on a filename.
It does any final confirmation necessary to ensure that the filename is
a valid one for the user to access.
@@ -529,7 +529,7 @@
}
if (!lp_widelinks(SNUM(conn)) || !lp_symlinks(SNUM(conn))) {
- NTSTATUS status = reduce_name(conn,name);
+ NTSTATUS status = check_reduced_name(conn,name);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(5,(check_name: name %s failed with %s\n,name,
nt_errstr(status)));
return status;
Modified: branches/SAMBA_3_0/source/smbd/nttrans.c
===
--- branches/SAMBA_3_0/source/smbd/nttrans.c2007-07-09 09:35:03 UTC (rev
23760)
+++ branches/SAMBA_3_0/source/smbd/nttrans.c2007-07-09 09:43:41 UTC (rev
23761)
@@ -1777,7 +1777,7 @@
}
/* Ensure this is within the share. */
- status = reduce_name(conn, oldname);
+ status = check_reduced_name(conn, oldname);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
Modified: branches/SAMBA_3_0/source/smbd/trans2.c
===
--- branches/SAMBA_3_0/source/smbd/trans2.c 2007-07-09 09:35:03 UTC (rev
23760)
+++ branches/SAMBA_3_0/source/smbd/trans2.c 2007-07-09 09:43:41 UTC (rev
23761)
@@ -4177,7 +4177,7 @@
}
/* Ensure this is within the share. */
- status = reduce_name(conn, oldname);
+ status = check_reduced_name(conn, oldname);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
Modified: branches/SAMBA_3_0/source/smbd/vfs.c
===
--- branches/SAMBA_3_0/source/smbd/vfs.c2007-07-09 09:35:03 UTC (rev
23760)
+++ branches/SAMBA_3_0/source/smbd/vfs.c2007-07-09 09:43:41 UTC (rev
23761)
@@ -802,7 +802,7 @@
it is below dir in the heirachy. This uses realpath.
/
-NTSTATUS reduce_name(connection_struct *conn, const pstring fname)
+NTSTATUS check_reduced_name(connection_struct *conn, const char *fname)
{
#ifdef REALPATH_TAKES_NULL
BOOL free_resolved_name = True;
Modified: branches/SAMBA_3_0_26/source/smbd/filename.c
===
--- branches/SAMBA_3_0_26/source/smbd/filename.c2007-07-09 09:35:03 UTC
(rev 23760)
+++ branches/SAMBA_3_0_26/source/smbd/filename.c2007-07-09 09:43:41 UTC
(rev 23761)
@@ -512,7 +512,7 @@
}
/
- Check a filename - possibly caling reducename.
+ Check a filename - possibly calling check_reduced_name.
This is called by every routine before it allows an operation on a filename.
It does any final confirmation necessary to ensure that the filename is
a valid one for the user to access.
@@ -529,7 +529,7 @@
}
if (!lp_widelinks(SNUM(conn)) || !lp_symlinks(SNUM(conn))) {
- NTSTATUS status = reduce_name(conn,name);
+ NTSTATUS status = check_reduced_name(conn,name);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(5,(check_name: name %s failed with %s\n,name,
nt_errstr(status)));
return status;
Modified: branches/SAMBA_3_0_26/source/smbd/nttrans.c
===
--- branches/SAMBA_3_0_26/source/smbd/nttrans.c 2007-07-09 09:35:03 UTC (rev
23760)
+++ branches/SAMBA_3_0_26/source/smbd/nttrans.c 2007-07-09 09:43:41 UTC (rev
23761)
@@ -1772,7 +1772,7 @@
}
/*
svn commit: samba r23762 - in branches/SAMBA_4_0: source/dsdb/samdb/ldb_modules source/ldap_server source/lib/ldb/ldb_tdb testprogs/ejs
Author: abartlet
Date: 2007-07-09 12:31:35 + (Mon, 09 Jul 2007)
New Revision: 23762
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23762
Log:
Fix DN renames over LDAP, and instrument the partition module. Add a
test to prove the behaviour of LDAP renames etc.
Fix LDB to return correct error code when failing to rename one DN
onto another.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c
branches/SAMBA_4_0/source/ldap_server/ldap_backend.c
branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c
branches/SAMBA_4_0/testprogs/ejs/ldap.js
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c
2007-07-09 09:43:41 UTC (rev 23761)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c
2007-07-09 12:31:35 UTC (rev 23762)
@@ -120,25 +120,6 @@
return NULL;
};
-static struct ldb_module *find_backend(struct ldb_module *module, struct
ldb_request *req, struct ldb_dn *dn)
-{
- struct dsdb_control_current_partition *partition;
- struct partition_private_data *data =
talloc_get_type(module-private_data,
- struct
partition_private_data);
-
- /* Skip the lot if 'data' isn't here yet (initialistion) */
- if (!data) {
- return module;
- }
-
- partition = find_partition(data, dn);
- if (!partition) {
- return module;
- }
-
- return make_module_for_next_request(req, module-ldb,
partition-module);
-};
-
/*
fire the caller's callback for every entry, but only send 'done' once.
*/
@@ -442,13 +423,34 @@
static int partition_rename(struct ldb_module *module, struct ldb_request *req)
{
/* Find backend */
- struct ldb_module *backend = find_backend(module, req,
req-op.rename.olddn);
- struct ldb_module *backend2 = find_backend(module, req,
req-op.rename.newdn);
+ struct dsdb_control_current_partition *backend, *backend2;
+
+ struct partition_private_data *data =
talloc_get_type(module-private_data,
+ struct
partition_private_data);
- if (backend-next != backend2-next) {
+ /* Skip the lot if 'data' isn't here yet (initialistion) */
+ if (!data) {
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+
+ backend = find_partition(data, req-op.rename.olddn);
+ backend2 = find_partition(data, req-op.rename.newdn);
+
+ if ((backend !backend2) || (!backend backend2)) {
return LDB_ERR_AFFECTS_MULTIPLE_DSAS;
}
+ if (backend != backend2) {
+ ldb_asprintf_errstring(module-ldb,
+ Cannot rename from %s in %s to %s in
%s: %s,
+
ldb_dn_get_linearized(req-op.rename.olddn),
+ ldb_dn_get_linearized(backend-dn),
+
ldb_dn_get_linearized(req-op.rename.newdn),
+ ldb_dn_get_linearized(backend2-dn),
+
ldb_strerror(LDB_ERR_AFFECTS_MULTIPLE_DSAS));
+ return LDB_ERR_AFFECTS_MULTIPLE_DSAS;
+ }
+
return partition_replicate(module, req, req-op.rename.olddn);
}
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_backend.c
===
--- branches/SAMBA_4_0/source/ldap_server/ldap_backend.c2007-07-09
09:43:41 UTC (rev 23761)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_backend.c2007-07-09
12:31:35 UTC (rev 23762)
@@ -621,6 +621,7 @@
result = LDAP_OTHER;
goto reply;
}
+ newdn = parentdn;
reply:
modifydn_r = ldapsrv_init_reply(call, LDAP_TAG_ModifyDNResponse);
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c
===
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c 2007-07-09 09:43:41 UTC
(rev 23761)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c 2007-07-09 12:31:35 UTC
(rev 23762)
@@ -857,9 +857,8 @@
goto done;
}
- tret = ltdb_add_internal(module, msg);
- if (tret != LDB_SUCCESS) {
- ret = LDB_ERR_OPERATIONS_ERROR;
+ ret = ltdb_add_internal(module, msg);
+ if (ret != LDB_SUCCESS) {
goto done;
}
Modified: branches/SAMBA_4_0/testprogs/ejs/ldap.js
===
--- branches/SAMBA_4_0/testprogs/ejs/ldap.js2007-07-09 09:43:41 UTC (rev
23761)
+++ branches/SAMBA_4_0/testprogs/ejs/ldap.js2007-07-09 12:31:35 UTC (rev
23762)
@@
svn commit: samba r23763 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch
Author: obnox
Date: 2007-07-09 12:59:17 + (Mon, 09 Jul 2007)
New Revision: 23763
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23763
Log:
Fix a typo in DEBUG message.
Thanks to Karolin Seeger ([EMAIL PROTECTED])
Modified:
branches/SAMBA_3_0/source/nsswitch/idmap.c
branches/SAMBA_3_0_26/source/nsswitch/idmap.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/idmap.c
===
--- branches/SAMBA_3_0/source/nsswitch/idmap.c 2007-07-09 12:31:35 UTC (rev
23762)
+++ branches/SAMBA_3_0/source/nsswitch/idmap.c 2007-07-09 12:59:17 UTC (rev
23763)
@@ -306,7 +306,7 @@
if ( dom_list ) {
DEBUG(0, (WARNING: idmap backend and idmap domains are
- mutually excusive!\n));
+ mutually exclusive!\n));
DEBUGADD(0,(idmap backend option will be IGNORED!\n));
} else {
compat = 1;
Modified: branches/SAMBA_3_0_26/source/nsswitch/idmap.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/idmap.c 2007-07-09 12:31:35 UTC
(rev 23762)
+++ branches/SAMBA_3_0_26/source/nsswitch/idmap.c 2007-07-09 12:59:17 UTC
(rev 23763)
@@ -306,7 +306,7 @@
if ( dom_list ) {
DEBUG(0, (WARNING: idmap backend and idmap domains are
- mutually excusive!\n));
+ mutually exclusive!\n));
DEBUGADD(0,(idmap backend option will be IGNORED!\n));
} else {
compat = 1;
svn commit: samba r23764 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_26/source/smbd
Author: vlendec
Date: 2007-07-09 13:04:44 + (Mon, 09 Jul 2007)
New Revision: 23764
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23764
Log:
Do restore_case_semantics in an error path. Jeremy, please check!
Modified:
branches/SAMBA_3_0/source/smbd/nttrans.c
branches/SAMBA_3_0_26/source/smbd/nttrans.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/nttrans.c
===
--- branches/SAMBA_3_0/source/smbd/nttrans.c2007-07-09 12:59:17 UTC (rev
23763)
+++ branches/SAMBA_3_0/source/smbd/nttrans.c2007-07-09 13:04:44 UTC (rev
23764)
@@ -731,6 +731,7 @@
/* Can't open a temp directory. IFS kit test. */
if (file_attributes FILE_ATTRIBUTE_TEMPORARY) {
+ restore_case_semantics(conn, file_attributes);
END_PROFILE(SMBntcreateX);
return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
Modified: branches/SAMBA_3_0_26/source/smbd/nttrans.c
===
--- branches/SAMBA_3_0_26/source/smbd/nttrans.c 2007-07-09 12:59:17 UTC (rev
23763)
+++ branches/SAMBA_3_0_26/source/smbd/nttrans.c 2007-07-09 13:04:44 UTC (rev
23764)
@@ -725,6 +725,7 @@
/* Can't open a temp directory. IFS kit test. */
if (file_attributes FILE_ATTRIBUTE_TEMPORARY) {
+ restore_case_semantics(conn, file_attributes);
END_PROFILE(SMBntcreateX);
return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
svn commit: samba r23765 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_26/source/smbd
Author: vlendec
Date: 2007-07-09 13:24:31 + (Mon, 09 Jul 2007)
New Revision: 23765
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23765
Log:
Another error-path restore_case_semantics().
Modified:
branches/SAMBA_3_0/source/smbd/nttrans.c
branches/SAMBA_3_0_26/source/smbd/nttrans.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/nttrans.c
===
--- branches/SAMBA_3_0/source/smbd/nttrans.c2007-07-09 13:04:44 UTC (rev
23764)
+++ branches/SAMBA_3_0/source/smbd/nttrans.c2007-07-09 13:24:31 UTC (rev
23765)
@@ -1377,6 +1377,7 @@
status = resolve_dfspath(conn, SVAL(inbuf,smb_flg2)
FLAGS2_DFS_PATHNAMES, fname);
if (!NT_STATUS_IS_OK(status)) {
+ restore_case_semantics(conn, file_attributes);
if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
return ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED, ERRSRV,
ERRbadpath);
}
Modified: branches/SAMBA_3_0_26/source/smbd/nttrans.c
===
--- branches/SAMBA_3_0_26/source/smbd/nttrans.c 2007-07-09 13:04:44 UTC (rev
23764)
+++ branches/SAMBA_3_0_26/source/smbd/nttrans.c 2007-07-09 13:24:31 UTC (rev
23765)
@@ -1371,6 +1371,7 @@
status = resolve_dfspath(conn, SVAL(inbuf,smb_flg2)
FLAGS2_DFS_PATHNAMES, fname);
if (!NT_STATUS_IS_OK(status)) {
+ restore_case_semantics(conn, file_attributes);
if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
return ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED, ERRSRV,
ERRbadpath);
}
svn commit: samba r23766 - in branches: SAMBA_3_0/source/include SAMBA_3_0_26/source/include
Author: gd Date: 2007-07-09 13:28:46 + (Mon, 09 Jul 2007) New Revision: 23766 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23766 Log: Add GTYPE_SECURITY_UNIVERSAL_GROUP define. Guenther Modified: branches/SAMBA_3_0/source/include/ads.h branches/SAMBA_3_0_26/source/include/ads.h Changeset: Modified: branches/SAMBA_3_0/source/include/ads.h === --- branches/SAMBA_3_0/source/include/ads.h 2007-07-09 13:24:31 UTC (rev 23765) +++ branches/SAMBA_3_0/source/include/ads.h 2007-07-09 13:28:46 UTC (rev 23766) @@ -258,6 +258,11 @@ GROUP_TYPE_ACCOUNT_GROUP| \ GROUP_TYPE_SECURITY_ENABLED \ ) +#define GTYPE_SECURITY_UNIVERSAL_GROUP ( /* 0x8008 -2147483656 */ \ + GROUP_TYPE_UNIVERSAL_GROUP| \ + GROUP_TYPE_SECURITY_ENABLED \ + ) + #define GTYPE_DISTRIBUTION_GLOBAL_GROUP0x0002 /* 2 */ #define GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP 0x0004 /* 4 */ #define GTYPE_DISTRIBUTION_UNIVERSAL_GROUP 0x0008 /* 8 */ Modified: branches/SAMBA_3_0_26/source/include/ads.h === --- branches/SAMBA_3_0_26/source/include/ads.h 2007-07-09 13:24:31 UTC (rev 23765) +++ branches/SAMBA_3_0_26/source/include/ads.h 2007-07-09 13:28:46 UTC (rev 23766) @@ -258,6 +258,11 @@ GROUP_TYPE_ACCOUNT_GROUP| \ GROUP_TYPE_SECURITY_ENABLED \ ) +#define GTYPE_SECURITY_UNIVERSAL_GROUP ( /* 0x8008 -2147483656 */ \ + GROUP_TYPE_UNIVERSAL_GROUP| \ + GROUP_TYPE_SECURITY_ENABLED \ + ) + #define GTYPE_DISTRIBUTION_GLOBAL_GROUP0x0002 /* 2 */ #define GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP 0x0004 /* 4 */ #define GTYPE_DISTRIBUTION_UNIVERSAL_GROUP 0x0008 /* 8 */
svn commit: samba r23767 - in branches: SAMBA_3_0/examples/misc SAMBA_3_0_26/examples/misc
Author: gd Date: 2007-07-09 13:31:32 + (Mon, 09 Jul 2007) New Revision: 23767 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23767 Log: Add GTYPE_SECURITY_UNIVERSAL_GROUP to adsearch.pl as well. Guenther Modified: branches/SAMBA_3_0/examples/misc/adssearch.pl branches/SAMBA_3_0_26/examples/misc/adssearch.pl Changeset: Modified: branches/SAMBA_3_0/examples/misc/adssearch.pl === --- branches/SAMBA_3_0/examples/misc/adssearch.pl 2007-07-09 13:28:46 UTC (rev 23766) +++ branches/SAMBA_3_0/examples/misc/adssearch.pl 2007-07-09 13:31:32 UTC (rev 23767) @@ -408,6 +408,7 @@ GTYPE_SECURITY_BUILTIN_LOCAL_GROUP= 0x8005, GTYPE_SECURITY_DOMAIN_LOCAL_GROUP = 0x8004, GTYPE_SECURITY_GLOBAL_GROUP = 0x8002, + GTYPE_SECURITY_UNIVERSAL_GROUP= 0x8008, GTYPE_DISTRIBUTION_GLOBAL_GROUP = 0x0002, GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP = 0x0004, GTYPE_DISTRIBUTION_UNIVERSAL_GROUP= 0x0008, Modified: branches/SAMBA_3_0_26/examples/misc/adssearch.pl === --- branches/SAMBA_3_0_26/examples/misc/adssearch.pl2007-07-09 13:28:46 UTC (rev 23766) +++ branches/SAMBA_3_0_26/examples/misc/adssearch.pl2007-07-09 13:31:32 UTC (rev 23767) @@ -408,6 +408,7 @@ GTYPE_SECURITY_BUILTIN_LOCAL_GROUP= 0x8005, GTYPE_SECURITY_DOMAIN_LOCAL_GROUP = 0x8004, GTYPE_SECURITY_GLOBAL_GROUP = 0x8002, + GTYPE_SECURITY_UNIVERSAL_GROUP= 0x8008, GTYPE_DISTRIBUTION_GLOBAL_GROUP = 0x0002, GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP = 0x0004, GTYPE_DISTRIBUTION_UNIVERSAL_GROUP= 0x0008,
svn commit: samba r23768 - in branches/SAMBA_3_0/source/smbd: .
Author: vlendec
Date: 2007-07-09 14:43:36 + (Mon, 09 Jul 2007)
New Revision: 23768
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23768
Log:
Get rid of the three global variables for the case semantics. I think
this is really not worth globals.
Jeremy, please check for 3.0.26.
Modified:
branches/SAMBA_3_0/source/smbd/nttrans.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/nttrans.c
===
--- branches/SAMBA_3_0/source/smbd/nttrans.c2007-07-09 13:31:32 UTC (rev
23767)
+++ branches/SAMBA_3_0/source/smbd/nttrans.c2007-07-09 14:43:36 UTC (rev
23768)
@@ -275,49 +275,49 @@
return (strchr_m(fname, ':') != NULL) ? True : False;
}
+struct case_semantics_state {
+ connection_struct *conn;
+ BOOL case_sensitive;
+ BOOL case_preserve;
+ BOOL short_case_preserve;
+};
+
/
- Save case statics.
+ Restore case semantics.
/
+static int restore_case_semantics(struct case_semantics_state *state)
+{
+ state-conn-case_sensitive = state-case_sensitive;
+ state-conn-case_preserve = state-case_preserve;
+ state-conn-short_case_preserve = state-short_case_preserve;
+ return 0;
+}
-static BOOL saved_case_sensitive;
-static BOOL saved_case_preserve;
-static BOOL saved_short_case_preserve;
-
/
Save case semantics.
/
+static struct case_semantics_state *set_posix_case_semantics(TALLOC_CTX
*mem_ctx,
+connection_struct
*conn)
+{
+ struct case_semantics_state *result;
-static uint32 set_posix_case_semantics(connection_struct *conn, uint32
file_attributes)
-{
- if(!(file_attributes FILE_FLAG_POSIX_SEMANTICS)) {
- return file_attributes;
+ if (!(result = talloc(mem_ctx, struct case_semantics_state))) {
+ DEBUG(0, (talloc failed\n));
+ return NULL;
}
- saved_case_sensitive = conn-case_sensitive;
- saved_case_preserve = conn-case_preserve;
- saved_short_case_preserve = conn-short_case_preserve;
+ result-case_sensitive = conn-case_sensitive;
+ result-case_preserve = conn-case_preserve;
+ result-short_case_preserve = conn-short_case_preserve;
/* Set to POSIX. */
conn-case_sensitive = True;
conn-case_preserve = True;
conn-short_case_preserve = True;
- return (file_attributes ~FILE_FLAG_POSIX_SEMANTICS);
-}
+ talloc_set_destructor(result, restore_case_semantics);
-/
- Restore case semantics.
-/
-
-static void restore_case_semantics(connection_struct *conn, uint32
file_attributes)
-{
- if(!(file_attributes FILE_FLAG_POSIX_SEMANTICS)) {
- return;
- }
-
- conn-case_sensitive = saved_case_sensitive;
- conn-case_preserve = saved_case_preserve;
- conn-short_case_preserve = saved_short_case_preserve;
+ return result;
}
/
@@ -487,7 +487,6 @@
uint32 flags = IVAL(inbuf,smb_ntcreate_Flags);
uint32 access_mask = IVAL(inbuf,smb_ntcreate_DesiredAccess);
uint32 file_attributes = IVAL(inbuf,smb_ntcreate_FileAttributes);
- uint32 new_file_attributes;
uint32 share_access = IVAL(inbuf,smb_ntcreate_ShareAccess);
uint32 create_disposition = IVAL(inbuf,smb_ntcreate_CreateDisposition);
uint32 create_options = IVAL(inbuf,smb_ntcreate_CreateOptions);
@@ -507,6 +506,7 @@
BOOL extended_oplock_granted = False;
NTSTATUS status;
struct smb_request req;
+ struct case_semantics_state *case_state = NULL;
START_PROFILE(SMBntcreateX);
@@ -676,18 +676,21 @@
* Check if POSIX semantics are wanted.
*/
- new_file_attributes = set_posix_case_semantics(conn, file_attributes);
+ if (file_attributes FILE_FLAG_POSIX_SEMANTICS) {
+ case_state = set_posix_case_semantics(NULL, conn);
+ file_attributes = ~FILE_FLAG_POSIX_SEMANTICS;
+ }
status = unix_convert(conn, fname, False, NULL, sbuf);
if (!NT_STATUS_IS_OK(status)) {
- restore_case_semantics(conn, file_attributes);
+ TALLOC_FREE(case_state);
END_PROFILE(SMBntcreateX);
return ERROR_NT(status);
}
/* All file access must go through check_name() */
status = check_name(conn,
svn commit: samba r23769 - in branches: SAMBA_3_0/source/lib SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/lib SAMBA_3_0_26/source/nsswitch
Author: obnox
Date: 2007-07-09 15:34:46 + (Mon, 09 Jul 2007)
New Revision: 23769
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23769
Log:
Move removal of the tdb from the generic tdb_validate function
to the caller (winbindd_validate_cache in this case).
Next, there will be a backup handling for the tdb files.
Michael
Modified:
branches/SAMBA_3_0/source/lib/util_tdb.c
branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
branches/SAMBA_3_0_26/source/lib/util_tdb.c
branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/util_tdb.c
===
--- branches/SAMBA_3_0/source/lib/util_tdb.c2007-07-09 14:43:36 UTC (rev
23768)
+++ branches/SAMBA_3_0/source/lib/util_tdb.c2007-07-09 15:34:46 UTC (rev
23769)
@@ -1118,12 +1118,6 @@
DEBUGADD(10, ( = overall success: %s\n, v_status.success ?
yes : no));
}
- if (!v_status.success) {
- DEBUG(10, (tdb_validate: validation not successful.\n));
- DEBUGADD(10, (removing tdb %s.\n, tdb_path));
- unlink(tdb_path);
- }
-
DEBUG(10, (tdb_validate: waiting for child to finish...\n));
while ((wait_pid = sys_waitpid(child_pid, child_status, 0)) 0) {
if (errno == EINTR) {
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2007-07-09 14:43:36 UTC
(rev 23768)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2007-07-09 15:34:46 UTC
(rev 23769)
@@ -3304,6 +3304,12 @@
ret = tdb_validate(lock_path(winbindd_cache.tdb),
cache_traverse_validate_fn);
+ if (ret != 0) {
+ DEBUG(10, (winbindd_validate_cache: validation not
successful.\n));
+ DEBUGADD(10, (removing tdb %s.\n, tdb_path));
+ unlink(tdb_path);
+ }
+
done:
DEBUG(10, (winbindd_validate_cache: restoring panic function\n));
smb_panic_fn = smb_panic;
Modified: branches/SAMBA_3_0_26/source/lib/util_tdb.c
===
--- branches/SAMBA_3_0_26/source/lib/util_tdb.c 2007-07-09 14:43:36 UTC (rev
23768)
+++ branches/SAMBA_3_0_26/source/lib/util_tdb.c 2007-07-09 15:34:46 UTC (rev
23769)
@@ -1118,12 +1118,6 @@
DEBUGADD(10, ( = overall success: %s\n, v_status.success ?
yes : no));
}
- if (!v_status.success) {
- DEBUG(10, (tdb_validate: validation not successful.\n));
- DEBUGADD(10, (removing tdb %s.\n, tdb_path));
- unlink(tdb_path);
- }
-
DEBUG(10, (tdb_validate: waiting for child to finish...\n));
while ((wait_pid = sys_waitpid(child_pid, child_status, 0)) 0) {
if (errno == EINTR) {
Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c 2007-07-09
14:43:36 UTC (rev 23768)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c 2007-07-09
15:34:46 UTC (rev 23769)
@@ -3304,6 +3304,12 @@
ret = tdb_validate(lock_path(winbindd_cache.tdb),
cache_traverse_validate_fn);
+ if (ret != 0) {
+ DEBUG(10, (winbindd_validate_cache: validation not
successful.\n));
+ DEBUGADD(10, (removing tdb %s.\n, tdb_path));
+ unlink(tdb_path);
+ }
+
done:
DEBUG(10, (winbindd_validate_cache: restoring panic function\n));
smb_panic_fn = smb_panic;
svn commit: samba r23770 - in branches: SAMBA_3_0/source/libgpo SAMBA_3_0/source/utils SAMBA_3_0_26/source/libgpo SAMBA_3_0_26/source/utils
Author: gd Date: 2007-07-09 15:48:17 + (Mon, 09 Jul 2007) New Revision: 23770 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23770 Log: Some minor cleanups in libgpo (including some valgrind errors, uninitialized vars, etc.) Guenther Modified: branches/SAMBA_3_0/source/libgpo/gpo_fetch.c branches/SAMBA_3_0/source/libgpo/gpo_ldap.c branches/SAMBA_3_0/source/libgpo/gpo_util.c branches/SAMBA_3_0/source/utils/net_ads_gpo.c branches/SAMBA_3_0_26/source/libgpo/gpo_fetch.c branches/SAMBA_3_0_26/source/libgpo/gpo_ldap.c branches/SAMBA_3_0_26/source/libgpo/gpo_util.c branches/SAMBA_3_0_26/source/utils/net_ads_gpo.c Changeset: Sorry, the patch is too large (1313 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23770
svn commit: samba r23771 - in branches: SAMBA_3_0/source/include SAMBA_3_0_26/source/include
Author: gd
Date: 2007-07-09 15:53:08 + (Mon, 09 Jul 2007)
New Revision: 23771
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23771
Log:
Merge useful W_ERROR_NOT_OK_RETURN macro from samba4.
Guenther
Modified:
branches/SAMBA_3_0/source/include/nt_status.h
branches/SAMBA_3_0_26/source/include/nt_status.h
Changeset:
Modified: branches/SAMBA_3_0/source/include/nt_status.h
===
--- branches/SAMBA_3_0/source/include/nt_status.h 2007-07-09 15:48:17 UTC
(rev 23770)
+++ branches/SAMBA_3_0/source/include/nt_status.h 2007-07-09 15:53:08 UTC
(rev 23771)
@@ -72,6 +72,12 @@
}\
} while (0)
+#define W_ERROR_NOT_OK_RETURN(x) do { \
+ if (!W_ERROR_IS_OK(x)) {\
+ return x;\
+ }\
+} while (0)
+
/* The top byte in an NTSTATUS code is used as a type field.
* Windows only uses value 0xC0 as an indicator for an NT error
* and 0x00 for success.
Modified: branches/SAMBA_3_0_26/source/include/nt_status.h
===
--- branches/SAMBA_3_0_26/source/include/nt_status.h2007-07-09 15:48:17 UTC
(rev 23770)
+++ branches/SAMBA_3_0_26/source/include/nt_status.h2007-07-09 15:53:08 UTC
(rev 23771)
@@ -72,6 +72,12 @@
}\
} while (0)
+#define W_ERROR_NOT_OK_RETURN(x) do { \
+ if (!W_ERROR_IS_OK(x)) {\
+ return x;\
+ }\
+} while (0)
+
/* The top byte in an NTSTATUS code is used as a type field.
* Windows only uses value 0xC0 as an indicator for an NT error
* and 0x00 for success.
svn commit: samba r23772 - in branches: SAMBA_3_0/source/libads SAMBA_3_0/source/utils SAMBA_3_0_26/source/libads SAMBA_3_0_26/source/utils
Author: gd
Date: 2007-07-09 16:03:00 + (Mon, 09 Jul 2007)
New Revision: 23772
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23772
Log:
Add ads_find_samaccount() helper function.
Guenther
Modified:
branches/SAMBA_3_0/source/libads/ldap.c
branches/SAMBA_3_0/source/utils/net_ads_gpo.c
branches/SAMBA_3_0_26/source/libads/ldap.c
branches/SAMBA_3_0_26/source/utils/net_ads_gpo.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/ldap.c
===
--- branches/SAMBA_3_0/source/libads/ldap.c 2007-07-09 15:53:08 UTC (rev
23771)
+++ branches/SAMBA_3_0/source/libads/ldap.c 2007-07-09 16:03:00 UTC (rev
23772)
@@ -3272,4 +3272,64 @@
return ADS_ERROR_LDAP(LDAP_SUCCESS);
}
+ADS_STATUS ads_find_samaccount(ADS_STRUCT *ads,
+ TALLOC_CTX *mem_ctx,
+ const char *samaccountname,
+ uint32 *uac_ret,
+ const char **dn_ret)
+{
+ ADS_STATUS status;
+ const char *attrs[] = { userAccountControl, NULL };
+ const char *filter;
+ LDAPMessage *res = NULL;
+ char *dn = NULL;
+ uint32 uac = 0;
+
+ filter = talloc_asprintf(mem_ctx,
((objectclass=user)(sAMAccountName=%s)),
+ samaccountname);
+ if (filter == NULL) {
+ goto out;
+ }
+
+ status = ads_do_search_all(ads, ads-config.bind_path,
+ LDAP_SCOPE_SUBTREE,
+ filter, attrs, res);
+
+ if (!ADS_ERR_OK(status)) {
+ goto out;
+ }
+
+ if (ads_count_replies(ads, res) != 1) {
+ printf(no result\n);
+ goto out;
+ }
+
+ dn = ads_get_dn(ads, res);
+ if (dn == NULL) {
+ status = ADS_ERROR(LDAP_NO_MEMORY);
+ goto out;
+ }
+
+ if (!ads_pull_uint32(ads, res, userAccountControl, uac)) {
+ status = ADS_ERROR(LDAP_NO_SUCH_ATTRIBUTE);
+ goto out;
+ }
+
+ if (uac_ret) {
+ *uac_ret = uac;
+ }
+
+ if (dn_ret) {
+ *dn_ret = talloc_strdup(mem_ctx, dn);
+ if (!*dn_ret) {
+ status = ADS_ERROR(LDAP_NO_MEMORY);
+ goto out;
+ }
+ }
+ out:
+ ads_memfree(ads, dn);
+ ads_msgfree(ads, res);
+
+ return status;
+}
#endif
Modified: branches/SAMBA_3_0/source/utils/net_ads_gpo.c
===
--- branches/SAMBA_3_0/source/utils/net_ads_gpo.c 2007-07-09 15:53:08 UTC
(rev 23771)
+++ branches/SAMBA_3_0/source/utils/net_ads_gpo.c 2007-07-09 16:03:00 UTC
(rev 23772)
@@ -46,10 +46,7 @@
TALLOC_CTX *mem_ctx;
ADS_STRUCT *ads;
ADS_STATUS status;
- const char *attrs[] = { userAccountControl, NULL };
- LDAPMessage *res = NULL;
- const char *filter;
- char *dn = NULL;
+ const char *dn = NULL;
struct GROUP_POLICY_OBJECT *gpo_list = NULL;
uint32 uac = 0;
uint32 flags = 0;
@@ -66,38 +63,17 @@
return -1;
}
- filter = talloc_asprintf(mem_ctx,
((objectclass=user)(sAMAccountName=%s)), argv[0]);
- if (filter == NULL) {
- goto out;
- }
-
status = ads_startup(False, ads);
if (!ADS_ERR_OK(status)) {
goto out;
}
- status = ads_do_search_all(ads, ads-config.bind_path,
- LDAP_SCOPE_SUBTREE,
- filter, attrs, res);
-
+ status = ads_find_samaccount(ads, mem_ctx, argv[0], uac, dn);
if (!ADS_ERR_OK(status)) {
+ printf(failed to find samaccount for %s\n, argv[0]);
goto out;
}
- if (ads_count_replies(ads, res) != 1) {
- printf(no result\n);
- goto out;
- }
-
- dn = ads_get_dn(ads, res);
- if (dn == NULL) {
- goto out;
- }
-
- if (!ads_pull_uint32(ads, res, userAccountControl, uac)) {
- goto out;
- }
-
if (uac UF_WORKSTATION_TRUST_ACCOUNT) {
flags |= GPO_LIST_FLAG_MACHINE;
}
@@ -139,9 +115,6 @@
}
out:
- ads_memfree(ads, dn);
- ads_msgfree(ads, res);
-
ads_destroy(ads);
talloc_destroy(mem_ctx);
return 0;
@@ -225,10 +198,7 @@
TALLOC_CTX *mem_ctx;
ADS_STRUCT *ads;
ADS_STATUS status;
- const char *attrs[] = {distinguishedName, userAccountControl, NULL};
- LDAPMessage *res = NULL;
- const char *filter;
- char *dn = NULL;
+ const char *dn = NULL;
struct GROUP_POLICY_OBJECT *gpo_list;
uint32 uac = 0;
uint32 flags = 0;
@@ -243,38 +213,16 @@
svn commit: samba r23773 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_26/source/smbd
Author: vlendec
Date: 2007-07-09 16:27:13 + (Mon, 09 Jul 2007)
New Revision: 23773
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23773
Log:
One pstring a day...
Modified:
branches/SAMBA_3_0/source/smbd/fileio.c
branches/SAMBA_3_0_26/source/smbd/fileio.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/fileio.c
===
--- branches/SAMBA_3_0/source/smbd/fileio.c 2007-07-09 16:03:00 UTC (rev
23772)
+++ branches/SAMBA_3_0/source/smbd/fileio.c 2007-07-09 16:27:13 UTC (rev
23773)
@@ -780,9 +780,11 @@
if(fsp-wcp) {
/* The cache *must* have been flushed before we do this. */
if (fsp-wcp-data_size != 0) {
- pstring msg;
- slprintf(msg, sizeof(msg)-1, set_filelen_write_cache:
size change \
-on file %s with write cache size = %lu\n, fsp-fsp_name, (unsigned
long)fsp-wcp-data_size );
+ char *msg;
+ asprintf(msg, set_filelen_write_cache: size change
+on file %s with write cache size = %lu\n,
+fsp-fsp_name,
+(unsigned long)fsp-wcp-data_size);
smb_panic(msg);
}
fsp-wcp-file_size = file_size;
Modified: branches/SAMBA_3_0_26/source/smbd/fileio.c
===
--- branches/SAMBA_3_0_26/source/smbd/fileio.c 2007-07-09 16:03:00 UTC (rev
23772)
+++ branches/SAMBA_3_0_26/source/smbd/fileio.c 2007-07-09 16:27:13 UTC (rev
23773)
@@ -780,9 +780,11 @@
if(fsp-wcp) {
/* The cache *must* have been flushed before we do this. */
if (fsp-wcp-data_size != 0) {
- pstring msg;
- slprintf(msg, sizeof(msg)-1, set_filelen_write_cache:
size change \
-on file %s with write cache size = %lu\n, fsp-fsp_name, (unsigned
long)fsp-wcp-data_size );
+ char *msg;
+ asprintf(msg, set_filelen_write_cache: size change
+on file %s with write cache size = %lu\n,
+fsp-fsp_name,
+(unsigned long)fsp-wcp-data_size);
smb_panic(msg);
}
fsp-wcp-file_size = file_size;
svn commit: samba-web r1132 - in trunk/docs: .
Author: jerry Date: 2007-07-09 17:12:37 + (Mon, 09 Jul 2007) New Revision: 1132 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1132 Log: update GPL notive to v3 Modified: trunk/docs/GPL.html Changeset: Sorry, the patch is too large (943 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1132
svn commit: samba r23774 - in branches: .
Author: jerry Date: 2007-07-09 18:16:03 + (Mon, 09 Jul 2007) New Revision: 23774 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23774 Log: branch 3.2 from 3.0 Added: branches/SAMBA_3_2/ Changeset: Copied: branches/SAMBA_3_2 (from rev 23773, branches/SAMBA_3_0)
svn commit: samba r23775 - in branches: .
Author: jerry Date: 2007-07-09 18:16:46 + (Mon, 09 Jul 2007) New Revision: 23775 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23775 Log: branch 3.2.0 from 3.0.26 Added: branches/SAMBA_3_2_0/ Changeset: Copied: branches/SAMBA_3_2_0 (from rev 23774, branches/SAMBA_3_0_26)
svn commit: samba r23776 - in branches: SAMBA_3_2/source SAMBA_3_2_0/source
Author: jerry Date: 2007-07-09 18:26:53 + (Mon, 09 Jul 2007) New Revision: 23776 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23776 Log: Setting version in 3.2 branch to 3.2.1pre1-SVN Setting version in 3.2.0 branch to 3.2.0pre1-SVN Modified: branches/SAMBA_3_2/source/VERSION branches/SAMBA_3_2_0/source/VERSION Changeset: Modified: branches/SAMBA_3_2/source/VERSION === --- branches/SAMBA_3_2/source/VERSION 2007-07-09 18:16:46 UTC (rev 23775) +++ branches/SAMBA_3_2/source/VERSION 2007-07-09 18:26:53 UTC (rev 23776) @@ -24,8 +24,8 @@ # - 3.0.0 # SAMBA_VERSION_MAJOR=3 -SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=27 +SAMBA_VERSION_MINOR=2 +SAMBA_VERSION_RELEASE=1 # If a official release has a serious bug # Modified: branches/SAMBA_3_2_0/source/VERSION === --- branches/SAMBA_3_2_0/source/VERSION 2007-07-09 18:16:46 UTC (rev 23775) +++ branches/SAMBA_3_2_0/source/VERSION 2007-07-09 18:26:53 UTC (rev 23776) @@ -24,8 +24,8 @@ # - 3.0.0 # SAMBA_VERSION_MAJOR=3 -SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=26 +SAMBA_VERSION_MINOR=2 +SAMBA_VERSION_RELEASE=0 # Bug fix releases use a letter for the patch revision #
svn commit: samba r23777 - in branches: SAMBA_3_2 SAMBA_3_2_0
Author: jerry Date: 2007-07-09 18:28:46 + (Mon, 09 Jul 2007) New Revision: 23777 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23777 Log: Set template release note files Modified: branches/SAMBA_3_2/WHATSNEW.txt branches/SAMBA_3_2_0/WHATSNEW.txt Changeset: Sorry, the patch is too large (8177 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23777
svn commit: samba r23778 - in branches: SAMBA_3_2 SAMBA_3_2_0
Author: jra Date: 2007-07-09 18:59:33 + (Mon, 09 Jul 2007) New Revision: 23778 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23778 Log: Change to GPLv3. Now to go through all internal source and headers. Probably will be a long day :-). Jeremy. Modified: branches/SAMBA_3_2/COPYING branches/SAMBA_3_2_0/COPYING Changeset: Sorry, the patch is too large (1871 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23778
svn commit: samba r23779 - in branches/SAMBA_3_2: examples/VFS examples/auth examples/libmsrpc/cacusermgr examples/libsmbclient examples/libsmbclient/smbwrapper examples/pdb examples/perfcounter examp
Author: jra Date: 2007-07-09 19:25:36 + (Mon, 09 Jul 2007) New Revision: 23779 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23779 Log: Change from v2 or later to v3 or later. Jeremy. Modified: branches/SAMBA_3_2/examples/VFS/shadow_copy_test.c branches/SAMBA_3_2/examples/VFS/skel_opaque.c branches/SAMBA_3_2/examples/VFS/skel_transparent.c branches/SAMBA_3_2/examples/auth/auth_skel.c branches/SAMBA_3_2/examples/libmsrpc/cacusermgr/cacusermgr.c branches/SAMBA_3_2/examples/libmsrpc/cacusermgr/cacusermgr.h branches/SAMBA_3_2/examples/libmsrpc/cacusermgr/mgr_group.c branches/SAMBA_3_2/examples/libmsrpc/cacusermgr/mgr_user.c branches/SAMBA_3_2/examples/libmsrpc/cacusermgr/util.c branches/SAMBA_3_2/examples/libsmbclient/smbwrapper/select.c branches/SAMBA_3_2/examples/libsmbclient/smbwrapper/smbsh.c branches/SAMBA_3_2/examples/libsmbclient/smbwrapper/smbw.c branches/SAMBA_3_2/examples/libsmbclient/smbwrapper/smbw.h branches/SAMBA_3_2/examples/libsmbclient/smbwrapper/smbw_dir.c branches/SAMBA_3_2/examples/libsmbclient/smbwrapper/smbw_stat.c branches/SAMBA_3_2/examples/libsmbclient/smbwrapper/wrapper.c branches/SAMBA_3_2/examples/libsmbclient/smbwrapper/wrapper.h branches/SAMBA_3_2/examples/libsmbclient/testsmbc.c branches/SAMBA_3_2/examples/libsmbclient/tree.c branches/SAMBA_3_2/examples/pdb/test.c branches/SAMBA_3_2/examples/perfcounter/perf.h branches/SAMBA_3_2/examples/perfcounter/perf_writer.c branches/SAMBA_3_2/examples/perfcounter/perf_writer_cpu.c branches/SAMBA_3_2/examples/perfcounter/perf_writer_disk.c branches/SAMBA_3_2/examples/perfcounter/perf_writer_mem.c branches/SAMBA_3_2/examples/perfcounter/perf_writer_process.c branches/SAMBA_3_2/examples/perfcounter/perf_writer_util.c branches/SAMBA_3_2/examples/printing/prtpub.c branches/SAMBA_3_2/source/auth/auth.c branches/SAMBA_3_2/source/auth/auth_builtin.c branches/SAMBA_3_2/source/auth/auth_compat.c branches/SAMBA_3_2/source/auth/auth_domain.c branches/SAMBA_3_2/source/auth/auth_ntlmssp.c branches/SAMBA_3_2/source/auth/auth_sam.c branches/SAMBA_3_2/source/auth/auth_script.c branches/SAMBA_3_2/source/auth/auth_server.c branches/SAMBA_3_2/source/auth/auth_unix.c branches/SAMBA_3_2/source/auth/auth_util.c branches/SAMBA_3_2/source/auth/auth_winbind.c branches/SAMBA_3_2/source/auth/pampass.c branches/SAMBA_3_2/source/auth/pass_check.c branches/SAMBA_3_2/source/auth/token_util.c branches/SAMBA_3_2/source/client/client.c branches/SAMBA_3_2/source/client/clitar.c branches/SAMBA_3_2/source/client/mount.cifs.c branches/SAMBA_3_2/source/client/smbctool.c branches/SAMBA_3_2/source/client/smbmnt.c branches/SAMBA_3_2/source/client/smbmount.c branches/SAMBA_3_2/source/client/smbspool.c branches/SAMBA_3_2/source/client/tree.c branches/SAMBA_3_2/source/client/umount.cifs.c branches/SAMBA_3_2/source/dynconfig.c branches/SAMBA_3_2/source/groupdb/mapping.c branches/SAMBA_3_2/source/groupdb/mapping_ldb.c branches/SAMBA_3_2/source/groupdb/mapping_tdb.c branches/SAMBA_3_2/source/include/MacExtensions.h branches/SAMBA_3_2/source/include/ads_cldap.h branches/SAMBA_3_2/source/include/ads_dns.h branches/SAMBA_3_2/source/include/adt_tree.h branches/SAMBA_3_2/source/include/asn_1.h branches/SAMBA_3_2/source/include/auth.h branches/SAMBA_3_2/source/include/authdata.h branches/SAMBA_3_2/source/include/byteorder.h branches/SAMBA_3_2/source/include/charset.h branches/SAMBA_3_2/source/include/client.h branches/SAMBA_3_2/source/include/clitar.h branches/SAMBA_3_2/source/include/ctdbd_conn.h branches/SAMBA_3_2/source/include/dbwrap.h branches/SAMBA_3_2/source/include/debug.h branches/SAMBA_3_2/source/include/dlinklist.h branches/SAMBA_3_2/source/include/doserr.h branches/SAMBA_3_2/source/include/dynconfig.h branches/SAMBA_3_2/source/include/event.h branches/SAMBA_3_2/source/include/fake_file.h branches/SAMBA_3_2/source/include/gpo.h branches/SAMBA_3_2/source/include/hmacmd5.h branches/SAMBA_3_2/source/include/includes.h branches/SAMBA_3_2/source/include/intl.h branches/SAMBA_3_2/source/include/libmsrpc.h branches/SAMBA_3_2/source/include/libmsrpc_internal.h branches/SAMBA_3_2/source/include/libsmbclient.h branches/SAMBA_3_2/source/include/locking.h branches/SAMBA_3_2/source/include/mapping.h branches/SAMBA_3_2/source/include/messages.h branches/SAMBA_3_2/source/include/module.h branches/SAMBA_3_2/source/include/msdfs.h branches/SAMBA_3_2/source/include/nameserv.h branches/SAMBA_3_2/source/include/nt_printing.h branches/SAMBA_3_2/source/include/nt_status.h branches/SAMBA_3_2/source/include/ntdomain.h branches/SAMBA_3_2/source/include/nterr.h branches/SAMBA_3_2/source/include/ntioctl.h branches/SAMBA_3_2/source/include/ntlmssp.h branches/SAMBA_3_2/source/include/ntquotas.h
Re: svn commit: samba r23764 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_26/source/smbd
On Mon, Jul 09, 2007 at 01:04:46PM +, [EMAIL PROTECTED] wrote: Author: vlendec Date: 2007-07-09 13:04:44 + (Mon, 09 Jul 2007) New Revision: 23764 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23764 Log: Do restore_case_semantics in an error path. Jeremy, please check! Yep, obviously correct, thanks ! Jeremy.
svn commit: samba r23781 - in branches/SAMBA_3_2_0/source/smbd: .
Author: jra
Date: 2007-07-09 21:48:33 + (Mon, 09 Jul 2007)
New Revision: 23781
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23781
Log:
Add Volker's change to remove globals :
Get rid of the three global variables for the case semantics. I think
this is really not worth globals.
Jeremy.
Modified:
branches/SAMBA_3_2_0/source/smbd/nttrans.c
Changeset:
Modified: branches/SAMBA_3_2_0/source/smbd/nttrans.c
===
--- branches/SAMBA_3_2_0/source/smbd/nttrans.c 2007-07-09 19:46:27 UTC (rev
23780)
+++ branches/SAMBA_3_2_0/source/smbd/nttrans.c 2007-07-09 21:48:33 UTC (rev
23781)
@@ -269,49 +269,49 @@
return (strchr_m(fname, ':') != NULL) ? True : False;
}
+struct case_semantics_state {
+ connection_struct *conn;
+ BOOL case_sensitive;
+ BOOL case_preserve;
+ BOOL short_case_preserve;
+};
+
/
- Save case statics.
+ Restore case semantics.
/
+static int restore_case_semantics(struct case_semantics_state *state)
+{
+ state-conn-case_sensitive = state-case_sensitive;
+ state-conn-case_preserve = state-case_preserve;
+ state-conn-short_case_preserve = state-short_case_preserve;
+ return 0;
+}
-static BOOL saved_case_sensitive;
-static BOOL saved_case_preserve;
-static BOOL saved_short_case_preserve;
-
/
Save case semantics.
/
+static struct case_semantics_state *set_posix_case_semantics(TALLOC_CTX
*mem_ctx,
+connection_struct
*conn)
+{
+ struct case_semantics_state *result;
-static uint32 set_posix_case_semantics(connection_struct *conn, uint32
file_attributes)
-{
- if(!(file_attributes FILE_FLAG_POSIX_SEMANTICS)) {
- return file_attributes;
+ if (!(result = talloc(mem_ctx, struct case_semantics_state))) {
+ DEBUG(0, (talloc failed\n));
+ return NULL;
}
- saved_case_sensitive = conn-case_sensitive;
- saved_case_preserve = conn-case_preserve;
- saved_short_case_preserve = conn-short_case_preserve;
+ result-case_sensitive = conn-case_sensitive;
+ result-case_preserve = conn-case_preserve;
+ result-short_case_preserve = conn-short_case_preserve;
/* Set to POSIX. */
conn-case_sensitive = True;
conn-case_preserve = True;
conn-short_case_preserve = True;
- return (file_attributes ~FILE_FLAG_POSIX_SEMANTICS);
-}
+ talloc_set_destructor(result, restore_case_semantics);
-/
- Restore case semantics.
-/
-
-static void restore_case_semantics(connection_struct *conn, uint32
file_attributes)
-{
- if(!(file_attributes FILE_FLAG_POSIX_SEMANTICS)) {
- return;
- }
-
- conn-case_sensitive = saved_case_sensitive;
- conn-case_preserve = saved_case_preserve;
- conn-short_case_preserve = saved_short_case_preserve;
+ return result;
}
/
@@ -481,7 +481,6 @@
uint32 flags = IVAL(inbuf,smb_ntcreate_Flags);
uint32 access_mask = IVAL(inbuf,smb_ntcreate_DesiredAccess);
uint32 file_attributes = IVAL(inbuf,smb_ntcreate_FileAttributes);
- uint32 new_file_attributes;
uint32 share_access = IVAL(inbuf,smb_ntcreate_ShareAccess);
uint32 create_disposition = IVAL(inbuf,smb_ntcreate_CreateDisposition);
uint32 create_options = IVAL(inbuf,smb_ntcreate_CreateOptions);
@@ -501,6 +500,7 @@
BOOL extended_oplock_granted = False;
NTSTATUS status;
struct smb_request req;
+ struct case_semantics_state *case_state = NULL;
START_PROFILE(SMBntcreateX);
@@ -670,18 +670,21 @@
* Check if POSIX semantics are wanted.
*/
- new_file_attributes = set_posix_case_semantics(conn, file_attributes);
+ if (file_attributes FILE_FLAG_POSIX_SEMANTICS) {
+ case_state = set_posix_case_semantics(NULL, conn);
+ file_attributes = ~FILE_FLAG_POSIX_SEMANTICS;
+ }
status = unix_convert(conn, fname, False, NULL, sbuf);
if (!NT_STATUS_IS_OK(status)) {
- restore_case_semantics(conn, file_attributes);
+ TALLOC_FREE(case_state);
END_PROFILE(SMBntcreateX);
return ERROR_NT(status);
}
/* All file access must go through check_name() */
status =
svn commit: samba r23782 - in branches: SAMBA_3_2/source/utils SAMBA_3_2_0/source/utils
Author: idra
Date: 2007-07-09 22:15:22 + (Mon, 09 Jul 2007)
New Revision: 23782
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23782
Log:
I tested this against NT4 PDC, W2K Server, W2K3 Dc, and a Win XP std alone
client and they all work with this code.
Modified:
branches/SAMBA_3_2/source/utils/smbcacls.c
branches/SAMBA_3_2_0/source/utils/smbcacls.c
Changeset:
Modified: branches/SAMBA_3_2/source/utils/smbcacls.c
===
--- branches/SAMBA_3_2/source/utils/smbcacls.c 2007-07-09 21:48:33 UTC (rev
23781)
+++ branches/SAMBA_3_2/source/utils/smbcacls.c 2007-07-09 22:15:22 UTC (rev
23782)
@@ -730,7 +730,7 @@
sort_acl(old-dacl);
/* Create new security descriptor and set it */
-#if 0
+
/* We used to just have WRITE_DAC_ACCESS without WRITE_OWNER.
But if we're sending an owner, even if it's the same as the one
that already exists then W2K3 insists we open with WRITE_OWNER
access.
@@ -742,12 +742,7 @@
NULL, old-dacl, sd_size);
fnum = cli_nt_create(cli, filename,
WRITE_DAC_ACCESS|WRITE_OWNER_ACCESS);
-#else
- sd = make_sec_desc(ctx,old-revision, old-type, NULL, NULL,
- NULL, old-dacl, sd_size);
- fnum = cli_nt_create(cli, filename, WRITE_DAC_ACCESS);
-#endif
if (fnum == -1) {
printf(cacl_set failed to open %s: %s\n, filename,
cli_errstr(cli));
return EXIT_FAILED;
Modified: branches/SAMBA_3_2_0/source/utils/smbcacls.c
===
--- branches/SAMBA_3_2_0/source/utils/smbcacls.c2007-07-09 21:48:33 UTC
(rev 23781)
+++ branches/SAMBA_3_2_0/source/utils/smbcacls.c2007-07-09 22:15:22 UTC
(rev 23782)
@@ -730,7 +730,7 @@
sort_acl(old-dacl);
/* Create new security descriptor and set it */
-#if 0
+
/* We used to just have WRITE_DAC_ACCESS without WRITE_OWNER.
But if we're sending an owner, even if it's the same as the one
that already exists then W2K3 insists we open with WRITE_OWNER
access.
@@ -742,12 +742,7 @@
NULL, old-dacl, sd_size);
fnum = cli_nt_create(cli, filename,
WRITE_DAC_ACCESS|WRITE_OWNER_ACCESS);
-#else
- sd = make_sec_desc(ctx,old-revision, old-type, NULL, NULL,
- NULL, old-dacl, sd_size);
- fnum = cli_nt_create(cli, filename, WRITE_DAC_ACCESS);
-#endif
if (fnum == -1) {
printf(cacl_set failed to open %s: %s\n, filename,
cli_errstr(cli));
return EXIT_FAILED;
Build status as of Tue Jul 10 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-07-09 00:01:05.0 + +++ /home/build/master/cache/broken_results.txt 2007-07-10 00:00:54.0 + @@ -1,4 +1,4 @@ -Build status as of Mon Jul 9 00:00:01 2007 +Build status as of Tue Jul 10 00:00:02 2007 Build counts: Tree Total Broken Panic @@ -7,19 +7,19 @@ ccache 34 7 0 ctdb 0 0 0 distcc 2 0 0 -ldb 33 2 0 +ldb 32 2 0 libreplace 32 10 0 lorikeet-heimdal 30 13 0 pidl 18 4 0 ppp 15 10 0 python 0 0 0 -rsync34 14 0 +rsync34 12 0 samba0 0 0 samba-docs 0 0 0 samba-gtk4 4 0 -samba4 32 19 7 -samba_3_035 18 0 +samba4 32 20 5 +samba_3_034 17 0 smb-build31 31 0 -talloc 33 7 0 -tdb 32 0 0 +talloc 34 7 0 +tdb 33 0 0
svn commit: samba r23783 - in branches: SAMBA_3_2/source/nmbd SAMBA_3_2/source/smbd SAMBA_3_2_0/source/nmbd SAMBA_3_2_0/source/smbd
Author: tridge
Date: 2007-07-10 00:47:40 + (Tue, 10 Jul 2007)
New Revision: 23783
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23783
Log:
Processing the UAS change message was causing problems on ppc64 Linux
systems. Rather than trying to fix this, it's much better just to
remove the code, as it serves no purpose at all (the message that is
generated is ignored by smbd).
This sort of parsing should really be done by PIDL generated code.
Modified:
branches/SAMBA_3_2/source/nmbd/nmbd_processlogon.c
branches/SAMBA_3_2/source/smbd/server.c
branches/SAMBA_3_2_0/source/nmbd/nmbd_processlogon.c
branches/SAMBA_3_2_0/source/smbd/server.c
Changeset:
Modified: branches/SAMBA_3_2/source/nmbd/nmbd_processlogon.c
===
--- branches/SAMBA_3_2/source/nmbd/nmbd_processlogon.c 2007-07-09 22:15:22 UTC
(rev 23782)
+++ branches/SAMBA_3_2/source/nmbd/nmbd_processlogon.c 2007-07-10 00:47:40 UTC
(rev 23783)
@@ -33,18 +33,6 @@
};
/
-Send a message to smbd to do a sam delta sync
-**/
-
-static void send_repl_message(uint32 low_serial)
-{
-DEBUG(3, (sending replication message, serial = 0x%04x\n,
- low_serial));
-message_send_all(nmbd_messaging_context(), MSG_SMB_SAM_REPL,
-low_serial, sizeof(low_serial), NULL);
-}
-
-/
Process a domain logon packet
**/
@@ -505,103 +493,9 @@
replication event is required. */
case SAM_UAS_CHANGE:
- {
- struct sam_database_info *db_info;
- char *q = buf + 2;
- int i, db_count;
- uint32 low_serial;
-
- /* Header */
-
- if (PTR_DIFF(q + 16, buf) = len) {
- DEBUG(0,(process_logon_packet: bad
packet\n));
- return;
- }
+ DEBUG(5, (Got SAM_UAS_CHANGE\n));
+ break;
- low_serial = IVAL(q, 0); q += 4; /* Low
serial number */
-
- q += 4; /* Date/time */
- q += 4; /* Pulse */
- q += 4; /* Random */
-
- /* Domain info */
-
- q = skip_string(buf,len,q);/* PDC name */
-
- if (!q || PTR_DIFF(q, buf) = len) {
- DEBUG(0,(process_logon_packet: bad
packet\n));
- return;
- }
-
- q = skip_string(buf,len,q);/* Domain name */
-
- if (!q || PTR_DIFF(q, buf) = len) {
- DEBUG(0,(process_logon_packet: bad
packet\n));
- return;
- }
-
- q = skip_unibuf(q, PTR_DIFF(buf + len, q)); /*
Unicode PDC name */
-
- if (PTR_DIFF(q, buf) = len) {
- DEBUG(0,(process_logon_packet: bad
packet\n));
- return;
- }
-
- q = skip_unibuf(q, PTR_DIFF(buf + len, q)); /*
Unicode domain name */
-
- /* Database info */
-
- if (PTR_DIFF(q + 2, buf) = len) {
- DEBUG(0,(process_logon_packet: bad
packet\n));
- return;
- }
-
- db_count = SVAL(q, 0); q += 2;
-
- if (PTR_DIFF(q + (db_count*20), buf) = len) {
- DEBUG(0,(process_logon_packet: bad
packet\n));
- return;
- }
-
- db_info = SMB_MALLOC_ARRAY(struct
sam_database_info, db_count);
-
- if (db_info == NULL) {
- DEBUG(3, (out of memory allocating
info for %d databases\n, db_count));
- return;
- }
-
- for (i = 0; i db_count; i++)
svn commit: samba r23784 - in branches: SAMBA_3_2/source SAMBA_3_2/source/auth SAMBA_3_2/source/client SAMBA_3_2/source/include SAMBA_3_2/source/intl SAMBA_3_2/source/lib SAMBA_3_2/source/lib/ldb/incl
Author: tridge Date: 2007-07-10 00:52:41 + (Tue, 10 Jul 2007) New Revision: 23784 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23784 Log: use the GPLv3 boilerplate as recommended by the FSF and the license text Modified: branches/SAMBA_3_2/source/auth/auth.c branches/SAMBA_3_2/source/auth/auth_builtin.c branches/SAMBA_3_2/source/auth/auth_compat.c branches/SAMBA_3_2/source/auth/auth_domain.c branches/SAMBA_3_2/source/auth/auth_ntlmssp.c branches/SAMBA_3_2/source/auth/auth_sam.c branches/SAMBA_3_2/source/auth/auth_script.c branches/SAMBA_3_2/source/auth/auth_server.c branches/SAMBA_3_2/source/auth/auth_unix.c branches/SAMBA_3_2/source/auth/auth_util.c branches/SAMBA_3_2/source/auth/auth_winbind.c branches/SAMBA_3_2/source/auth/pampass.c branches/SAMBA_3_2/source/auth/pass_check.c branches/SAMBA_3_2/source/client/client.c branches/SAMBA_3_2/source/client/clitar.c branches/SAMBA_3_2/source/client/mount.cifs.c branches/SAMBA_3_2/source/client/smbctool.c branches/SAMBA_3_2/source/client/smbmount.c branches/SAMBA_3_2/source/client/smbspool.c branches/SAMBA_3_2/source/client/tree.c branches/SAMBA_3_2/source/client/umount.cifs.c branches/SAMBA_3_2/source/dynconfig.c branches/SAMBA_3_2/source/include/MacExtensions.h branches/SAMBA_3_2/source/include/ads_cldap.h branches/SAMBA_3_2/source/include/asn_1.h branches/SAMBA_3_2/source/include/auth.h branches/SAMBA_3_2/source/include/authdata.h branches/SAMBA_3_2/source/include/byteorder.h branches/SAMBA_3_2/source/include/charset.h branches/SAMBA_3_2/source/include/client.h branches/SAMBA_3_2/source/include/ctdbd_conn.h branches/SAMBA_3_2/source/include/dbwrap.h branches/SAMBA_3_2/source/include/debug.h branches/SAMBA_3_2/source/include/dlinklist.h branches/SAMBA_3_2/source/include/doserr.h branches/SAMBA_3_2/source/include/dynconfig.h branches/SAMBA_3_2/source/include/event.h branches/SAMBA_3_2/source/include/fake_file.h branches/SAMBA_3_2/source/include/hmacmd5.h branches/SAMBA_3_2/source/include/includes.h branches/SAMBA_3_2/source/include/intl.h branches/SAMBA_3_2/source/include/locking.h branches/SAMBA_3_2/source/include/messages.h branches/SAMBA_3_2/source/include/module.h branches/SAMBA_3_2/source/include/msdfs.h branches/SAMBA_3_2/source/include/nameserv.h branches/SAMBA_3_2/source/include/nt_printing.h branches/SAMBA_3_2/source/include/nt_status.h branches/SAMBA_3_2/source/include/ntdomain.h branches/SAMBA_3_2/source/include/nterr.h branches/SAMBA_3_2/source/include/ntioctl.h branches/SAMBA_3_2/source/include/ntlmssp.h branches/SAMBA_3_2/source/include/ntquotas.h branches/SAMBA_3_2/source/include/packet.h branches/SAMBA_3_2/source/include/passdb.h branches/SAMBA_3_2/source/include/popt_common.h branches/SAMBA_3_2/source/include/printing.h branches/SAMBA_3_2/source/include/privileges.h branches/SAMBA_3_2/source/include/pstring.h branches/SAMBA_3_2/source/include/rap.h branches/SAMBA_3_2/source/include/reg_db.h branches/SAMBA_3_2/source/include/reg_objects.h branches/SAMBA_3_2/source/include/rpc_brs.h branches/SAMBA_3_2/source/include/rpc_client.h branches/SAMBA_3_2/source/include/rpc_dce.h branches/SAMBA_3_2/source/include/rpc_ds.h branches/SAMBA_3_2/source/include/rpc_lsa.h branches/SAMBA_3_2/source/include/rpc_misc.h branches/SAMBA_3_2/source/include/rpc_netlogon.h branches/SAMBA_3_2/source/include/rpc_ntsvcs.h branches/SAMBA_3_2/source/include/rpc_samr.h branches/SAMBA_3_2/source/include/rpc_secdes.h branches/SAMBA_3_2/source/include/rpc_spoolss.h branches/SAMBA_3_2/source/include/rpc_svcctl.h branches/SAMBA_3_2/source/include/safe_string.h branches/SAMBA_3_2/source/include/samba_linux_quota.h branches/SAMBA_3_2/source/include/session.h branches/SAMBA_3_2/source/include/smb.h branches/SAMBA_3_2/source/include/smb_acls.h branches/SAMBA_3_2/source/include/smb_launchd.h branches/SAMBA_3_2/source/include/smb_ldap.h branches/SAMBA_3_2/source/include/smb_macros.h branches/SAMBA_3_2/source/include/smbldap.h branches/SAMBA_3_2/source/include/smbprofile.h branches/SAMBA_3_2/source/include/spnego.h branches/SAMBA_3_2/source/include/srvstr.h branches/SAMBA_3_2/source/include/trans2.h branches/SAMBA_3_2/source/include/util_getent.h branches/SAMBA_3_2/source/include/util_tdb.h branches/SAMBA_3_2/source/include/vfs.h branches/SAMBA_3_2/source/include/vfs_macros.h branches/SAMBA_3_2/source/include/xfile.h branches/SAMBA_3_2/source/intl/lang_tdb.c branches/SAMBA_3_2/source/lib/arc4.c branches/SAMBA_3_2/source/lib/audit.c branches/SAMBA_3_2/source/lib/bitmap.c branches/SAMBA_3_2/source/lib/charcnv.c branches/SAMBA_3_2/source/lib/clobber.c branches/SAMBA_3_2/source/lib/conn_tdb.c branches/SAMBA_3_2/source/lib/ctdbd_conn.c
svn commit: samba r23785 - in branches: SAMBA_3_2/examples/auth SAMBA_3_2/examples/libsmbclient SAMBA_3_2/examples/libsmbclient/smbwrapper SAMBA_3_2/testsuite/nsswitch SAMBA_3_2/testsuite/printing SAM
Author: tridge Date: 2007-07-10 00:57:11 + (Tue, 10 Jul 2007) New Revision: 23785 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23785 Log: use the GPLv3 boilerplate as recommended by the FSF and the license text Modified: branches/SAMBA_3_2/examples/auth/auth_skel.c branches/SAMBA_3_2/examples/libsmbclient/smbwrapper/select.c branches/SAMBA_3_2/examples/libsmbclient/smbwrapper/smbsh.c branches/SAMBA_3_2/examples/libsmbclient/smbwrapper/smbw.c branches/SAMBA_3_2/examples/libsmbclient/smbwrapper/smbw.h branches/SAMBA_3_2/examples/libsmbclient/smbwrapper/smbw_dir.c branches/SAMBA_3_2/examples/libsmbclient/smbwrapper/smbw_stat.c branches/SAMBA_3_2/examples/libsmbclient/smbwrapper/wrapper.c branches/SAMBA_3_2/examples/libsmbclient/smbwrapper/wrapper.h branches/SAMBA_3_2/examples/libsmbclient/testsmbc.c branches/SAMBA_3_2/examples/libsmbclient/tree.c branches/SAMBA_3_2/testsuite/nsswitch/getent_grent.c branches/SAMBA_3_2/testsuite/nsswitch/getent_pwent.c branches/SAMBA_3_2/testsuite/nsswitch/longarg_getgrnam.c branches/SAMBA_3_2/testsuite/nsswitch/longarg_getpwnam.c branches/SAMBA_3_2/testsuite/nsswitch/longarg_utils.h branches/SAMBA_3_2/testsuite/printing/psec.c branches/SAMBA_3_2/testsuite/printing/vlp.c branches/SAMBA_3_2/testsuite/smbd/se_access_check_allowall.c branches/SAMBA_3_2/testsuite/smbd/se_access_check_allowsome.c branches/SAMBA_3_2/testsuite/smbd/se_access_check_denyall.c branches/SAMBA_3_2/testsuite/smbd/se_access_check_denysome.c branches/SAMBA_3_2/testsuite/smbd/se_access_check_empty.c branches/SAMBA_3_2/testsuite/smbd/se_access_check_nullsd.c branches/SAMBA_3_2/testsuite/smbd/se_access_check_printer.c branches/SAMBA_3_2/testsuite/smbd/se_access_check_utils.c branches/SAMBA_3_2/testsuite/smbd/se_access_check_utils.h branches/SAMBA_3_2/testsuite/smbd/sec_ctx1.c branches/SAMBA_3_2/testsuite/smbd/sec_ctx_current_user.c branches/SAMBA_3_2/testsuite/smbd/sec_ctx_flow.c branches/SAMBA_3_2/testsuite/smbd/sec_ctx_groups.c branches/SAMBA_3_2/testsuite/smbd/sec_ctx_nonroot.c branches/SAMBA_3_2/testsuite/smbd/sec_ctx_root.c branches/SAMBA_3_2/testsuite/smbd/sec_ctx_stack.c branches/SAMBA_3_2/testsuite/smbd/sec_ctx_torture.c branches/SAMBA_3_2/testsuite/smbd/sec_ctx_utils.c branches/SAMBA_3_2/testsuite/smbd/sec_ctx_utils.h branches/SAMBA_3_2_0/examples/auth/auth_skel.c branches/SAMBA_3_2_0/examples/libsmbclient/smbwrapper/select.c branches/SAMBA_3_2_0/examples/libsmbclient/smbwrapper/smbsh.c branches/SAMBA_3_2_0/examples/libsmbclient/smbwrapper/smbw.c branches/SAMBA_3_2_0/examples/libsmbclient/smbwrapper/smbw.h branches/SAMBA_3_2_0/examples/libsmbclient/smbwrapper/smbw_dir.c branches/SAMBA_3_2_0/examples/libsmbclient/smbwrapper/smbw_stat.c branches/SAMBA_3_2_0/examples/libsmbclient/smbwrapper/wrapper.c branches/SAMBA_3_2_0/examples/libsmbclient/smbwrapper/wrapper.h branches/SAMBA_3_2_0/examples/libsmbclient/testsmbc.c branches/SAMBA_3_2_0/examples/libsmbclient/tree.c branches/SAMBA_3_2_0/testsuite/nsswitch/getent_grent.c branches/SAMBA_3_2_0/testsuite/nsswitch/getent_pwent.c branches/SAMBA_3_2_0/testsuite/nsswitch/longarg_getgrnam.c branches/SAMBA_3_2_0/testsuite/nsswitch/longarg_getpwnam.c branches/SAMBA_3_2_0/testsuite/nsswitch/longarg_utils.h branches/SAMBA_3_2_0/testsuite/printing/psec.c branches/SAMBA_3_2_0/testsuite/printing/vlp.c branches/SAMBA_3_2_0/testsuite/smbd/se_access_check_allowall.c branches/SAMBA_3_2_0/testsuite/smbd/se_access_check_allowsome.c branches/SAMBA_3_2_0/testsuite/smbd/se_access_check_denyall.c branches/SAMBA_3_2_0/testsuite/smbd/se_access_check_denysome.c branches/SAMBA_3_2_0/testsuite/smbd/se_access_check_empty.c branches/SAMBA_3_2_0/testsuite/smbd/se_access_check_nullsd.c branches/SAMBA_3_2_0/testsuite/smbd/se_access_check_printer.c branches/SAMBA_3_2_0/testsuite/smbd/se_access_check_utils.c branches/SAMBA_3_2_0/testsuite/smbd/se_access_check_utils.h branches/SAMBA_3_2_0/testsuite/smbd/sec_ctx1.c branches/SAMBA_3_2_0/testsuite/smbd/sec_ctx_current_user.c branches/SAMBA_3_2_0/testsuite/smbd/sec_ctx_flow.c branches/SAMBA_3_2_0/testsuite/smbd/sec_ctx_groups.c branches/SAMBA_3_2_0/testsuite/smbd/sec_ctx_nonroot.c branches/SAMBA_3_2_0/testsuite/smbd/sec_ctx_root.c branches/SAMBA_3_2_0/testsuite/smbd/sec_ctx_stack.c branches/SAMBA_3_2_0/testsuite/smbd/sec_ctx_torture.c branches/SAMBA_3_2_0/testsuite/smbd/sec_ctx_utils.c branches/SAMBA_3_2_0/testsuite/smbd/sec_ctx_utils.h Changeset: Sorry, the patch is too large (1109 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23785
svn commit: samba r23786 - in branches: SAMBA_3_2/source SAMBA_3_2/source/include SAMBA_3_2/source/lib SAMBA_3_2/source/smbd SAMBA_3_2_0/source SAMBA_3_2_0/source/include SAMBA_3_2_0/source/lib SAMBA_
Author: tridge
Date: 2007-07-10 01:15:57 + (Tue, 10 Jul 2007)
New Revision: 23786
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23786
Log:
Use linux/dqblk_xfs.h rather than a private copy of this header in the
Samba3 tree.
This is neater, plus it avoids the need to get legal approval from SGI
to use their GPLv2-only code under GPLv3.
If/when SGI legal sort things out, we could consider adding back this
header for very old systems where linux/dqblk_xfs.h is not available.
Removed:
branches/SAMBA_3_2/source/include/samba_xfs_quota.h
branches/SAMBA_3_2_0/source/include/samba_xfs_quota.h
Modified:
branches/SAMBA_3_2/source/configure.in
branches/SAMBA_3_2/source/lib/sysquotas_xfs.c
branches/SAMBA_3_2/source/smbd/quotas.c
branches/SAMBA_3_2_0/source/configure.in
branches/SAMBA_3_2_0/source/lib/sysquotas_xfs.c
branches/SAMBA_3_2_0/source/smbd/quotas.c
Changeset:
Modified: branches/SAMBA_3_2/source/configure.in
===
--- branches/SAMBA_3_2/source/configure.in 2007-07-10 00:57:11 UTC (rev
23785)
+++ branches/SAMBA_3_2/source/configure.in 2007-07-10 01:15:57 UTC (rev
23786)
@@ -4763,6 +4763,9 @@
# For quotas on Veritas VxFS filesystems
AC_CHECK_HEADERS(sys/fs/vx_quota.h)
+# For quotas on Linux XFS filesystems
+AC_CHECK_HEADERS(linux/dqblk_xfs.h)
+
# For sys/quota.h and linux/quota.h
AC_CHECK_HEADERS(sys/quota.h)
Deleted: branches/SAMBA_3_2/source/include/samba_xfs_quota.h
===
--- branches/SAMBA_3_2/source/include/samba_xfs_quota.h 2007-07-10 00:57:11 UTC
(rev 23785)
+++ branches/SAMBA_3_2/source/include/samba_xfs_quota.h 2007-07-10 01:15:57 UTC
(rev 23786)
@@ -1,165 +0,0 @@
-#ifndef _SAMBA_LINUX_XFS_H_
-#define _SAMBA_LINUX_XFS_H_
-
-#ifndef _QUOTAIO_LINUX_XFS
-#define _QUOTAIO_LINUX_XFS
-
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like. Any license provided herein, whether implied or
- * otherwise, applies only to this software file. Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA 94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
- */
-
-#include linux/types.h
-
-#define XQM_CMD(cmd) ( ('X'8)+(cmd) )
-#define IS_XQM_CMD(cmd)( ((int)(cmd)8) == 'X' )
-
-/*
- * Disk quota - quotactl(2) commands for XFS Quota Manager (XQM).
- */
-#define Q_XQUOTAON XQM_CMD(0x1) /* enable quota accounting/enforcement
*/
-#define Q_XQUOTAOFF XQM_CMD(0x2) /* disable quota accounting/enforcement
*/
-#define Q_XGETQUOTA XQM_CMD(0x3) /* get disk limits usage */
-#define Q_XSETQLIM XQM_CMD(0x4) /* set disk limits only */
-#define Q_XGETQSTAT XQM_CMD(0x5) /* returns fs_quota_stat_t struct */
-#define Q_XQUOTARM XQM_CMD(0x6) /* free quota files' space */
-
-/*
- * fs_disk_quota structure:
- *
- * This contains the current quota information regarding a user/proj/group.
- * It is 64-bit aligned, and all the blk units are in BBs (Basic Blocks) of
- * 512 bytes.
- */
-#define FS_DQUOT_VERSION 1 /* fs_disk_quota.d_version */
-typedef struct fs_disk_quota {
- u_int8_t d_version; /* version of this structure */
- u_int8_t d_flags; /* XFS_{USER,PROJ,GROUP}_QUOTA */
- u_int16_t d_fieldmask; /* field specifier */
- u_int32_t d_id; /* user, project, or group ID */
- u_int64_t d_blk_hardlimit; /* absolute limit on disk blks */
- u_int64_t d_blk_softlimit; /* preferred limit on disk blks */
- u_int64_t d_ino_hardlimit; /* maximum # allocated inodes */
- u_int64_t d_ino_softlimit; /* preferred inode limit */
- u_int64_t d_bcount; /* # disk blocks owned by the user */
- u_int64_t d_icount; /* # inodes owned by the user */
- int32_t d_itimer;
svn commit: samba r23787 - in branches: SAMBA_3_2/pcp SAMBA_3_2_0/pcp
Author: tridge Date: 2007-07-10 01:18:53 + (Tue, 10 Jul 2007) New Revision: 23787 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23787 Log: Remove the pcp example code until SGI have given us approval to use it under GPLv3 Removed: branches/SAMBA_3_2/pcp/samba.c branches/SAMBA_3_2_0/pcp/samba.c Modified: branches/SAMBA_3_2/pcp/README branches/SAMBA_3_2_0/pcp/README Changeset: Sorry, the patch is too large (821 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23787
svn commit: samba r23788 - in branches: SAMBA_3_2/pcp SAMBA_3_2_0/pcp
Author: tridge Date: 2007-07-10 01:36:33 + (Tue, 10 Jul 2007) New Revision: 23788 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23788 Log: the pcp Makefile is also GPLv2 only. Removed: branches/SAMBA_3_2/pcp/Makefile branches/SAMBA_3_2_0/pcp/Makefile Changeset: Deleted: branches/SAMBA_3_2/pcp/Makefile === --- branches/SAMBA_3_2/pcp/Makefile 2007-07-10 01:18:53 UTC (rev 23787) +++ branches/SAMBA_3_2/pcp/Makefile 2007-07-10 01:36:33 UTC (rev 23788) @@ -1,74 +0,0 @@ -#!make -# -# Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it would be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# Further, this software is distributed without any warranty that it is -# free of the rightful claim of any third person regarding infringement -# or the like. Any license provided herein, whether implied or -# otherwise, applies only to this software file. Patent licenses, if -# any, provided herein do not apply to combinations of this program with -# other software, or any other product whatsoever. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write the Free Software Foundation, Inc., 59 -# Temple Place - Suite 330, Boston MA 02111-1307, USA. -# -# Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, -# Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# -# http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ -# - -SHELL = sh - -include /etc/pcp.conf - -IAM= samba -CFILES = $(IAM).c - -LIBTARGET = pmda_$(IAM).so -CMDTARGET = pmda$(IAM) -TARGETS = $(LIBTARGET) $(CMDTARGET) - -DEBUG = -DDEBUG -CFLAGS = $(DEBUG) -LDOPTS = -LDLIBS = -lpcp_pmda -lpcp -DSOOPTS= -shared -LDIRT = profile.h metrics.h so_locations *.log help.dir help.pag *.pmda_$(IAM).so - -PROFILEHEADER = ../source/include/smbprofile.h - -INSTALL= install -CC = cc - -default: $(TARGETS) - -install: default - -$(CMDTARGET): profile.h metrics.h $(CFILES) - $(CC) $(CFLAGS) $(CFILES) $(LDOPTS) $(LDLIBS) -o $@ - -$(LIBTARGET): profile.h metrics.h $(CFILES) - $(CC) $(CFLAGS) $(DSOOPTS) $(LDOPTS) $(CFILES) $(LDLIBS) -o $@ - -metrics.h: profile.h mkheader.pl - ./mkheader.pl - -profile.h: $(PROFILEHEADER) - ln -s $(PROFILEHEADER) $@ - -clobber clean: - rm -f $(LDIRT) $(TARGETS) Deleted: branches/SAMBA_3_2_0/pcp/Makefile === --- branches/SAMBA_3_2_0/pcp/Makefile 2007-07-10 01:18:53 UTC (rev 23787) +++ branches/SAMBA_3_2_0/pcp/Makefile 2007-07-10 01:36:33 UTC (rev 23788) @@ -1,74 +0,0 @@ -#!make -# -# Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it would be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# Further, this software is distributed without any warranty that it is -# free of the rightful claim of any third person regarding infringement -# or the like. Any license provided herein, whether implied or -# otherwise, applies only to this software file. Patent licenses, if -# any, provided herein do not apply to combinations of this program with -# other software, or any other product whatsoever. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write the Free Software Foundation, Inc., 59 -# Temple Place - Suite 330, Boston MA 02111-1307, USA. -# -# Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, -# Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# -# http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ -# - -SHELL = sh - -include /etc/pcp.conf - -IAM= samba -CFILES = $(IAM).c - -LIBTARGET = pmda_$(IAM).so -CMDTARGET = pmda$(IAM) -TARGETS = $(LIBTARGET) $(CMDTARGET) - -DEBUG = -DDEBUG -CFLAGS = $(DEBUG) -LDOPTS = -LDLIBS = -lpcp_pmda -lpcp -DSOOPTS= -shared -LDIRT = profile.h metrics.h so_locations *.log help.dir help.pag *.pmda_$(IAM).so - -PROFILEHEADER = ../source/include/smbprofile.h - -INSTALL= install -CC = cc - -default: $(TARGETS) - -install: default - -$(CMDTARGET): profile.h metrics.h $(CFILES)
svn commit: samba r23789 - in branches: SAMBA_3_2/pcp SAMBA_3_2_0/pcp
Author: tridge
Date: 2007-07-10 01:39:08 + (Tue, 10 Jul 2007)
New Revision: 23789
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23789
Log:
more pcp files under v2-only
Removed:
branches/SAMBA_3_2/pcp/Install
branches/SAMBA_3_2/pcp/Remove
branches/SAMBA_3_2_0/pcp/Install
branches/SAMBA_3_2_0/pcp/Remove
Changeset:
Deleted: branches/SAMBA_3_2/pcp/Install
===
--- branches/SAMBA_3_2/pcp/Install 2007-07-10 01:36:33 UTC (rev 23788)
+++ branches/SAMBA_3_2/pcp/Install 2007-07-10 01:39:08 UTC (rev 23789)
@@ -1,64 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of version 2 of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Further, this software is distributed without any warranty that it is
-# free of the rightful claim of any third person regarding infringement
-# or the like. Any license provided herein, whether implied or
-# otherwise, applies only to this software file. Patent licenses, if
-# any, provided herein do not apply to combinations of this program with
-# other software, or any other product whatsoever.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write the Free Software Foundation, Inc., 59
-# Temple Place - Suite 330, Boston MA 02111-1307, USA.
-#
-# Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
-# Mountain View, CA 94043, or:
-#
-# http://www.sgi.com
-#
-# For further information regarding this notice, see:
-#
-# http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
-#
-# Install the samba PMDA and/or PMNS
-#
-
-# source the PCP configuration environment variables
-. /etc/pcp.env
-
-# Get the common procedures and variable assignments
-#
-. $PCP_SHARE_DIR/lib/pmdaproc.sh
-
-# The name of the PMDA
-#
-iam=samba
-
-# override interactive dialog from pmdaproc.sh
-#
-__choose_mode()
-{
-echo Installing the \$iam\ Performance Metrics Domain Agent (PMDA) ...
-echo
-}
-
-# Using libpcp_pmda.so.2 and PMDA_INTERFACE_2
-#
-pmda_interface=2
-
-# Do it
-#
-pmdaSetup
-pmdaInstall
-
-exit 0
Deleted: branches/SAMBA_3_2/pcp/Remove
===
--- branches/SAMBA_3_2/pcp/Remove 2007-07-10 01:36:33 UTC (rev 23788)
+++ branches/SAMBA_3_2/pcp/Remove 2007-07-10 01:39:08 UTC (rev 23789)
@@ -1,52 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of version 2 of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Further, this software is distributed without any warranty that it is
-# free of the rightful claim of any third person regarding infringement
-# or the like. Any license provided herein, whether implied or
-# otherwise, applies only to this software file. Patent licenses, if
-# any, provided herein do not apply to combinations of this program with
-# other software, or any other product whatsoever.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write the Free Software Foundation, Inc., 59
-# Temple Place - Suite 330, Boston MA 02111-1307, USA.
-#
-# Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
-# Mountain View, CA 94043, or:
-#
-# http://www.sgi.com
-#
-# For further information regarding this notice, see:
-#
-# http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
-#
-# Remove the samba PMDA
-#
-
-# source the PCP configuration environment variables
-. /etc/pcp.env
-
-# Get the common procedures and variable assignments
-#
-. $PCP_SHARE_DIR/lib/pmdaproc.sh
-
-# The name of the PMDA
-#
-iam=samba
-
-# Do it
-#
-pmdaSetup
-pmdaRemove
-
-exit 0
Deleted: branches/SAMBA_3_2_0/pcp/Install
===
--- branches/SAMBA_3_2_0/pcp/Install2007-07-10 01:36:33 UTC (rev 23788)
+++ branches/SAMBA_3_2_0/pcp/Install2007-07-10 01:39:08 UTC (rev 23789)
@@ -1,64 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of version 2 of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is
svn commit: samba r23792 - in branches/SAMBA_4_0: source source/auth source/auth/credentials source/auth/gensec source/auth/kerberos source/auth/ntlmssp source/cldap_server source/client source/cluste
Author: tridge Date: 2007-07-10 02:07:03 + (Tue, 10 Jul 2007) New Revision: 23792 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23792 Log: convert Samba4 to GPLv3 There are still a few tidyups of old FSF addresses to come (in both s3 and s4). More commits soon. Modified: branches/SAMBA_4_0/source/auth/auth.c branches/SAMBA_4_0/source/auth/auth.h branches/SAMBA_4_0/source/auth/auth_anonymous.c branches/SAMBA_4_0/source/auth/auth_developer.c branches/SAMBA_4_0/source/auth/auth_sam.c branches/SAMBA_4_0/source/auth/auth_sam_reply.c branches/SAMBA_4_0/source/auth/auth_server.c branches/SAMBA_4_0/source/auth/auth_simple.c branches/SAMBA_4_0/source/auth/auth_unix.c branches/SAMBA_4_0/source/auth/auth_util.c branches/SAMBA_4_0/source/auth/auth_winbind.c branches/SAMBA_4_0/source/auth/credentials/credentials.c branches/SAMBA_4_0/source/auth/credentials/credentials.h branches/SAMBA_4_0/source/auth/credentials/credentials_files.c branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.h branches/SAMBA_4_0/source/auth/credentials/credentials_ntlm.c branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c branches/SAMBA_4_0/source/auth/gensec/gensec.c branches/SAMBA_4_0/source/auth/gensec/gensec.h branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c branches/SAMBA_4_0/source/auth/gensec/schannel.c branches/SAMBA_4_0/source/auth/gensec/schannel.h branches/SAMBA_4_0/source/auth/gensec/schannel_sign.c branches/SAMBA_4_0/source/auth/gensec/schannel_state.c branches/SAMBA_4_0/source/auth/gensec/socket.c branches/SAMBA_4_0/source/auth/gensec/socket.h branches/SAMBA_4_0/source/auth/gensec/spnego.c branches/SAMBA_4_0/source/auth/gensec/spnego.h branches/SAMBA_4_0/source/auth/gensec/spnego_parse.c branches/SAMBA_4_0/source/auth/kerberos/clikrb5.c branches/SAMBA_4_0/source/auth/kerberos/gssapi_parse.c branches/SAMBA_4_0/source/auth/kerberos/kerberos.c branches/SAMBA_4_0/source/auth/kerberos/kerberos.h branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c branches/SAMBA_4_0/source/auth/kerberos/kerberos_util.c branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.h branches/SAMBA_4_0/source/auth/ntlm_check.c branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp.c branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp.h branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_client.c branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_parse.c branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_server.c branches/SAMBA_4_0/source/auth/sam.c branches/SAMBA_4_0/source/cldap_server/cldap_server.c branches/SAMBA_4_0/source/cldap_server/cldap_server.h branches/SAMBA_4_0/source/cldap_server/netlogon.c branches/SAMBA_4_0/source/cldap_server/rootdse.c branches/SAMBA_4_0/source/client/cifsdd.c branches/SAMBA_4_0/source/client/cifsdd.h branches/SAMBA_4_0/source/client/cifsddio.c branches/SAMBA_4_0/source/client/client.c branches/SAMBA_4_0/source/client/smbmount.c branches/SAMBA_4_0/source/client/smbspool.c branches/SAMBA_4_0/source/client/tree.c branches/SAMBA_4_0/source/cluster/cluster.c branches/SAMBA_4_0/source/cluster/cluster.h branches/SAMBA_4_0/source/cluster/cluster_private.h branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.h branches/SAMBA_4_0/source/cluster/ctdb/opendb_ctdb.c branches/SAMBA_4_0/source/cluster/local.c branches/SAMBA_4_0/source/dsdb/common/flag_mapping.c branches/SAMBA_4_0/source/dsdb/common/flags.h branches/SAMBA_4_0/source/dsdb/common/sidmap.c branches/SAMBA_4_0/source/dsdb/repl/drepl_out_helpers.c branches/SAMBA_4_0/source/dsdb/repl/drepl_out_helpers.h branches/SAMBA_4_0/source/dsdb/repl/drepl_out_pull.c branches/SAMBA_4_0/source/dsdb/repl/drepl_partitions.c branches/SAMBA_4_0/source/dsdb/repl/drepl_periodic.c branches/SAMBA_4_0/source/dsdb/repl/drepl_service.c branches/SAMBA_4_0/source/dsdb/repl/drepl_service.h branches/SAMBA_4_0/source/dsdb/repl/replicated_objects.c branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/dsdb_cache.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/entryUUID.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/kludge_acl.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/local_password.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/naming_fsmo.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/pdc_fsmo.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/rootdse.c
svn commit: samba r23794 - in branches: SAMBA_3_2/source/include SAMBA_3_2/source/lib/ldb/nssldb SAMBA_3_2/source/nsswitch SAMBA_3_2_0/source/include SAMBA_3_2_0/source/lib/ldb/nssldb SAMBA_3_2_0/sour
Author: tridge Date: 2007-07-10 02:31:50 + (Tue, 10 Jul 2007) New Revision: 23794 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23794 Log: convert more code from LGPLv2+ to LGPLv3+ Modified: branches/SAMBA_3_2/source/include/idmap.h branches/SAMBA_3_2/source/include/nss_info.h branches/SAMBA_3_2/source/lib/ldb/nssldb/ldb-grp.c branches/SAMBA_3_2/source/lib/ldb/nssldb/ldb-nss.c branches/SAMBA_3_2/source/lib/ldb/nssldb/ldb-nss.h branches/SAMBA_3_2/source/lib/ldb/nssldb/ldb-pwd.c branches/SAMBA_3_2/source/nsswitch/nss_info.c branches/SAMBA_3_2/source/nsswitch/nss_info_template.c branches/SAMBA_3_2/source/nsswitch/wb_client.c branches/SAMBA_3_2/source/nsswitch/wb_common.c branches/SAMBA_3_2/source/nsswitch/winbind_nss.h branches/SAMBA_3_2/source/nsswitch/winbind_nss_aix.c branches/SAMBA_3_2/source/nsswitch/winbind_nss_config.h branches/SAMBA_3_2/source/nsswitch/winbind_nss_freebsd.c branches/SAMBA_3_2/source/nsswitch/winbind_nss_hpux.h branches/SAMBA_3_2/source/nsswitch/winbind_nss_irix.c branches/SAMBA_3_2/source/nsswitch/winbind_nss_irix.h branches/SAMBA_3_2/source/nsswitch/winbind_nss_linux.c branches/SAMBA_3_2/source/nsswitch/winbind_nss_linux.h branches/SAMBA_3_2/source/nsswitch/winbind_nss_netbsd.c branches/SAMBA_3_2/source/nsswitch/winbind_nss_netbsd.h branches/SAMBA_3_2/source/nsswitch/winbind_nss_solaris.h branches/SAMBA_3_2/source/nsswitch/winbindd.h branches/SAMBA_3_2_0/source/include/idmap.h branches/SAMBA_3_2_0/source/include/nss_info.h branches/SAMBA_3_2_0/source/lib/ldb/nssldb/ldb-grp.c branches/SAMBA_3_2_0/source/lib/ldb/nssldb/ldb-nss.c branches/SAMBA_3_2_0/source/lib/ldb/nssldb/ldb-nss.h branches/SAMBA_3_2_0/source/lib/ldb/nssldb/ldb-pwd.c branches/SAMBA_3_2_0/source/nsswitch/nss_info.c branches/SAMBA_3_2_0/source/nsswitch/nss_info_template.c branches/SAMBA_3_2_0/source/nsswitch/wb_client.c branches/SAMBA_3_2_0/source/nsswitch/wb_common.c branches/SAMBA_3_2_0/source/nsswitch/winbind_nss.h branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_aix.c branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_config.h branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_freebsd.c branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_hpux.h branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_irix.c branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_irix.h branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_linux.c branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_linux.h branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_netbsd.c branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_netbsd.h branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_solaris.h branches/SAMBA_3_2_0/source/nsswitch/winbindd.h branches/SAMBA_4_0/source/lib/ldb/nssldb/ldb-grp.c branches/SAMBA_4_0/source/lib/ldb/nssldb/ldb-nss.c branches/SAMBA_4_0/source/lib/ldb/nssldb/ldb-nss.h branches/SAMBA_4_0/source/lib/ldb/nssldb/ldb-pwd.c branches/SAMBA_4_0/source/nsswitch/wb_common.c branches/SAMBA_4_0/source/nsswitch/winbind_nss.h branches/SAMBA_4_0/source/nsswitch/winbind_nss_config.h branches/SAMBA_4_0/source/nsswitch/winbind_nss_hpux.h branches/SAMBA_4_0/source/nsswitch/winbind_nss_irix.h branches/SAMBA_4_0/source/nsswitch/winbind_nss_linux.c branches/SAMBA_4_0/source/nsswitch/winbind_nss_linux.h branches/SAMBA_4_0/source/nsswitch/winbind_nss_solaris.h Changeset: Sorry, the patch is too large (1447 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23794
svn commit: samba r23796 - in branches/SAMBA_4_0: . source/lib/json source/lib/ldb/external source/lib/ldb/swig source/lib/replace source/lib/talloc source/lib/tdb/swig source/lib/util source/param
Author: tridge Date: 2007-07-10 03:04:16 + (Tue, 10 Jul 2007) New Revision: 23796 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23796 Log: main COPYING file for samba4, plus some formatting varients Modified: branches/SAMBA_4_0/COPYING branches/SAMBA_4_0/source/lib/json/aclocal.m4 branches/SAMBA_4_0/source/lib/json/configure branches/SAMBA_4_0/source/lib/json/ltmain.sh branches/SAMBA_4_0/source/lib/ldb/external/pkg.m4 branches/SAMBA_4_0/source/lib/ldb/swig/Ldb.py branches/SAMBA_4_0/source/lib/replace/getpass.c branches/SAMBA_4_0/source/lib/replace/strptime.c branches/SAMBA_4_0/source/lib/talloc/talloc.3.xml branches/SAMBA_4_0/source/lib/tdb/swig/Tdb.py branches/SAMBA_4_0/source/lib/util/util_file.c branches/SAMBA_4_0/source/param/secrets.h Changeset: Sorry, the patch is too large (1089 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23796
svn commit: samba r23797 - in branches: SAMBA_3_2/examples/pcap2nbench SAMBA_3_2/source/lib/replace SAMBA_3_2/testsuite/nsswitch SAMBA_3_2_0/examples/pcap2nbench SAMBA_3_2_0/source/lib/replace SAMBA_3
Author: tridge Date: 2007-07-10 03:17:46 + (Tue, 10 Jul 2007) New Revision: 23797 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23797 Log: started fixing old FSF addresses. Fixed pcap2nbench COPYING file Modified: branches/SAMBA_3_2/examples/pcap2nbench/COPYING branches/SAMBA_3_2/source/lib/replace/strptime.c branches/SAMBA_3_2/testsuite/nsswitch/getent.c branches/SAMBA_3_2_0/examples/pcap2nbench/COPYING branches/SAMBA_3_2_0/source/lib/replace/strptime.c branches/SAMBA_3_2_0/testsuite/nsswitch/getent.c branches/SAMBA_4_0/source/lib/replace/strptime.c Changeset: Sorry, the patch is too large (1956 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23797
svn commit: samba r23799 - in branches: SAMBA_3_2/examples/VFS SAMBA_3_2/source SAMBA_3_2/source/lib/ldb SAMBA_3_2/source/lib/ldb/examples SAMBA_3_2/source/lib/replace SAMBA_3_2/source/lib/talloc SAMB
Author: tridge Date: 2007-07-10 03:52:17 + (Tue, 10 Jul 2007) New Revision: 23799 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23799 Log: updated old Franklin Street FSF addresses to new URL Modified: branches/SAMBA_3_2/examples/VFS/config.guess branches/SAMBA_3_2/examples/VFS/config.sub branches/SAMBA_3_2/source/config.guess branches/SAMBA_3_2/source/config.sub branches/SAMBA_3_2/source/depcomp branches/SAMBA_3_2/source/lib/ldb/config.guess branches/SAMBA_3_2/source/lib/ldb/config.sub branches/SAMBA_3_2/source/lib/ldb/examples/ldbreader.c branches/SAMBA_3_2/source/lib/ldb/examples/ldifreader.c branches/SAMBA_3_2/source/lib/replace/config.guess branches/SAMBA_3_2/source/lib/replace/config.sub branches/SAMBA_3_2/source/lib/talloc/config.guess branches/SAMBA_3_2/source/lib/talloc/config.sub branches/SAMBA_3_2/source/lib/tdb/config.guess branches/SAMBA_3_2/source/lib/tdb/config.sub branches/SAMBA_3_2/source/libaddns/addns.h branches/SAMBA_3_2/source/libaddns/dns.h branches/SAMBA_3_2/source/libaddns/dnserr.h branches/SAMBA_3_2/source/libaddns/dnsgss.c branches/SAMBA_3_2/source/libaddns/dnsmarshall.c branches/SAMBA_3_2/source/libaddns/dnsrecord.c branches/SAMBA_3_2/source/libaddns/dnssock.c branches/SAMBA_3_2/source/libaddns/dnsutils.c branches/SAMBA_3_2_0/examples/VFS/config.guess branches/SAMBA_3_2_0/examples/VFS/config.sub branches/SAMBA_3_2_0/source/config.guess branches/SAMBA_3_2_0/source/config.sub branches/SAMBA_3_2_0/source/lib/ldb/config.guess branches/SAMBA_3_2_0/source/lib/ldb/config.sub branches/SAMBA_3_2_0/source/lib/ldb/examples/ldbreader.c branches/SAMBA_3_2_0/source/lib/ldb/examples/ldifreader.c branches/SAMBA_3_2_0/source/lib/replace/config.guess branches/SAMBA_3_2_0/source/lib/replace/config.sub branches/SAMBA_3_2_0/source/lib/talloc/config.guess branches/SAMBA_3_2_0/source/lib/talloc/config.sub branches/SAMBA_3_2_0/source/lib/tdb/config.guess branches/SAMBA_3_2_0/source/lib/tdb/config.sub branches/SAMBA_3_2_0/source/libaddns/addns.h branches/SAMBA_3_2_0/source/libaddns/dns.h branches/SAMBA_3_2_0/source/libaddns/dnserr.h branches/SAMBA_3_2_0/source/libaddns/dnsgss.c branches/SAMBA_3_2_0/source/libaddns/dnsmarshall.c branches/SAMBA_3_2_0/source/libaddns/dnsrecord.c branches/SAMBA_3_2_0/source/libaddns/dnssock.c branches/SAMBA_3_2_0/source/libaddns/dnsutils.c branches/SAMBA_4_0/source/cluster/ctdb/config.guess branches/SAMBA_4_0/source/config.guess branches/SAMBA_4_0/source/config.sub branches/SAMBA_4_0/source/heimdal/lib/asn1/parse.c branches/SAMBA_4_0/source/heimdal/lib/asn1/parse.h branches/SAMBA_4_0/source/heimdal/lib/com_err/parse.c branches/SAMBA_4_0/source/heimdal/lib/com_err/parse.h branches/SAMBA_4_0/source/lib/json/aclocal.m4 branches/SAMBA_4_0/source/lib/json/configure branches/SAMBA_4_0/source/lib/ldb/config.guess branches/SAMBA_4_0/source/lib/ldb/config.sub branches/SAMBA_4_0/source/lib/ldb/examples/ldbreader.c branches/SAMBA_4_0/source/lib/ldb/examples/ldifreader.c branches/SAMBA_4_0/source/lib/replace/config.guess branches/SAMBA_4_0/source/lib/replace/config.sub branches/SAMBA_4_0/source/lib/talloc/config.guess branches/SAMBA_4_0/source/lib/talloc/config.sub branches/SAMBA_4_0/source/lib/tdb/config.guess branches/SAMBA_4_0/source/lib/tdb/config.sub Changeset: Sorry, the patch is too large (1021 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23799
svn commit: samba r23800 - in branches: SAMBA_3_2/source/include SAMBA_3_2/source/lib SAMBA_3_2/source/lib/ldb/nssldb SAMBA_3_2/source/lib/replace SAMBA_3_2/source/nsswitch SAMBA_3_2/source/tests SAMB
Author: tridge Date: 2007-07-10 04:04:46 + (Tue, 10 Jul 2007) New Revision: 23800 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23800 Log: LGPL is now called GNU Lesser General Public License not GNU Library General Public License Modified: branches/SAMBA_3_2/source/include/debugparse.h branches/SAMBA_3_2/source/include/idmap.h branches/SAMBA_3_2/source/include/nss_info.h branches/SAMBA_3_2/source/lib/ldb/nssldb/ldb-grp.c branches/SAMBA_3_2/source/lib/ldb/nssldb/ldb-nss.c branches/SAMBA_3_2/source/lib/ldb/nssldb/ldb-nss.h branches/SAMBA_3_2/source/lib/ldb/nssldb/ldb-pwd.c branches/SAMBA_3_2/source/lib/replace/getpass.c branches/SAMBA_3_2/source/lib/replace/strptime.c branches/SAMBA_3_2/source/lib/ufc.c branches/SAMBA_3_2/source/nsswitch/nss_info.c branches/SAMBA_3_2/source/nsswitch/nss_info_template.c branches/SAMBA_3_2/source/nsswitch/wb_client.c branches/SAMBA_3_2/source/nsswitch/wb_common.c branches/SAMBA_3_2/source/nsswitch/winbind_nss.h branches/SAMBA_3_2/source/nsswitch/winbind_nss_aix.c branches/SAMBA_3_2/source/nsswitch/winbind_nss_config.h branches/SAMBA_3_2/source/nsswitch/winbind_nss_freebsd.c branches/SAMBA_3_2/source/nsswitch/winbind_nss_hpux.h branches/SAMBA_3_2/source/nsswitch/winbind_nss_irix.c branches/SAMBA_3_2/source/nsswitch/winbind_nss_irix.h branches/SAMBA_3_2/source/nsswitch/winbind_nss_linux.c branches/SAMBA_3_2/source/nsswitch/winbind_nss_linux.h branches/SAMBA_3_2/source/nsswitch/winbind_nss_netbsd.c branches/SAMBA_3_2/source/nsswitch/winbind_nss_netbsd.h branches/SAMBA_3_2/source/nsswitch/winbind_nss_solaris.c branches/SAMBA_3_2/source/nsswitch/winbind_nss_solaris.h branches/SAMBA_3_2/source/nsswitch/winbindd.h branches/SAMBA_3_2/source/tests/crypttest.c branches/SAMBA_3_2/source/utils/debugparse.c branches/SAMBA_3_2/testsuite/nsswitch/getent.c branches/SAMBA_3_2_0/source/include/debugparse.h branches/SAMBA_3_2_0/source/include/idmap.h branches/SAMBA_3_2_0/source/include/nss_info.h branches/SAMBA_3_2_0/source/lib/ldb/nssldb/ldb-grp.c branches/SAMBA_3_2_0/source/lib/ldb/nssldb/ldb-nss.c branches/SAMBA_3_2_0/source/lib/ldb/nssldb/ldb-nss.h branches/SAMBA_3_2_0/source/lib/ldb/nssldb/ldb-pwd.c branches/SAMBA_3_2_0/source/lib/replace/getpass.c branches/SAMBA_3_2_0/source/lib/replace/strptime.c branches/SAMBA_3_2_0/source/lib/ufc.c branches/SAMBA_3_2_0/source/nsswitch/nss_info.c branches/SAMBA_3_2_0/source/nsswitch/nss_info_template.c branches/SAMBA_3_2_0/source/nsswitch/wb_client.c branches/SAMBA_3_2_0/source/nsswitch/wb_common.c branches/SAMBA_3_2_0/source/nsswitch/winbind_nss.h branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_aix.c branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_config.h branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_freebsd.c branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_hpux.h branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_irix.c branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_irix.h branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_linux.c branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_linux.h branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_netbsd.c branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_netbsd.h branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_solaris.c branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_solaris.h branches/SAMBA_3_2_0/source/nsswitch/winbindd.h branches/SAMBA_3_2_0/source/tests/crypttest.c branches/SAMBA_3_2_0/source/utils/debugparse.c branches/SAMBA_3_2_0/testsuite/nsswitch/getent.c branches/SAMBA_4_0/source/build/tests/crypttest.c branches/SAMBA_4_0/source/lib/ldb/nssldb/ldb-grp.c branches/SAMBA_4_0/source/lib/ldb/nssldb/ldb-nss.c branches/SAMBA_4_0/source/lib/ldb/nssldb/ldb-nss.h branches/SAMBA_4_0/source/lib/ldb/nssldb/ldb-pwd.c branches/SAMBA_4_0/source/lib/replace/getpass.c branches/SAMBA_4_0/source/lib/replace/strptime.c branches/SAMBA_4_0/source/nsswitch/wb_common.c branches/SAMBA_4_0/source/nsswitch/winbind_nss.h branches/SAMBA_4_0/source/nsswitch/winbind_nss_config.h branches/SAMBA_4_0/source/nsswitch/winbind_nss_hpux.h branches/SAMBA_4_0/source/nsswitch/winbind_nss_irix.h branches/SAMBA_4_0/source/nsswitch/winbind_nss_linux.c branches/SAMBA_4_0/source/nsswitch/winbind_nss_linux.h branches/SAMBA_4_0/source/nsswitch/winbind_nss_solaris.h Changeset: Sorry, the patch is too large (1770 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23800
svn commit: samba r23802 - in branches: SAMBA_3_2/source/lib/talloc SAMBA_3_2_0/source/lib/talloc SAMBA_4_0/source/lib/talloc
Author: tridge Date: 2007-07-10 05:42:52 + (Tue, 10 Jul 2007) New Revision: 23802 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23802 Log: fixed URL in XML Modified: branches/SAMBA_3_2/source/lib/talloc/talloc.3.xml branches/SAMBA_3_2_0/source/lib/talloc/talloc.3.xml branches/SAMBA_4_0/source/lib/talloc/talloc.3.xml Changeset: Modified: branches/SAMBA_3_2/source/lib/talloc/talloc.3.xml === --- branches/SAMBA_3_2/source/lib/talloc/talloc.3.xml 2007-07-10 05:23:25 UTC (rev 23801) +++ branches/SAMBA_3_2/source/lib/talloc/talloc.3.xml 2007-07-10 05:42:52 UTC (rev 23802) @@ -732,7 +732,7 @@ /para para You should have received a copy of the GNU General Public License - along with this program; if not, see http://www.gnu.org/licenses/. + along with this program; if not, see http://www.gnu.org/licenses/. /para /refsect1 /refentry Modified: branches/SAMBA_3_2_0/source/lib/talloc/talloc.3.xml === --- branches/SAMBA_3_2_0/source/lib/talloc/talloc.3.xml 2007-07-10 05:23:25 UTC (rev 23801) +++ branches/SAMBA_3_2_0/source/lib/talloc/talloc.3.xml 2007-07-10 05:42:52 UTC (rev 23802) @@ -732,7 +732,7 @@ /para para You should have received a copy of the GNU General Public License - along with this program; if not, see http://www.gnu.org/licenses/. + along with this program; if not, see http://www.gnu.org/licenses/. /para /refsect1 /refentry Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.3.xml === --- branches/SAMBA_4_0/source/lib/talloc/talloc.3.xml 2007-07-10 05:23:25 UTC (rev 23801) +++ branches/SAMBA_4_0/source/lib/talloc/talloc.3.xml 2007-07-10 05:42:52 UTC (rev 23802) @@ -732,7 +732,7 @@ /para para You should have received a copy of the GNU General Public License - along with this program; if not, see http://www.gnu.org/licenses/. + along with this program; if not, see http://www.gnu.org/licenses/. /para /refsect1 /refentry
Rev 571: update lib/tdb from samba4 in http://samba.org/~tridge/ctdb
revno: 571 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Tue 2007-07-10 15:32:27 +1000 message: update lib/tdb from samba4 modified: lib/tdb/common/dump.c dump.c-20070220022425-m1wibgjq7n5hahs6-2 lib/tdb/common/error.c error.c-20070220022425-m1wibgjq7n5hahs6-3 lib/tdb/common/freelist.c freelist.c-20070220022425-m1wibgjq7n5hahs6-4 lib/tdb/common/freelistcheck.c freelistcheck.c-20070220022425-m1wibgjq7n5hahs6-5 lib/tdb/common/io.cio.c-20070220022425-m1wibgjq7n5hahs6-6 lib/tdb/common/lock.c lock.c-20070220022425-m1wibgjq7n5hahs6-7 lib/tdb/common/open.c open.c-20070220022425-m1wibgjq7n5hahs6-8 lib/tdb/common/tdb.c tdb.c-20070220022425-m1wibgjq7n5hahs6-9 lib/tdb/common/tdb_private.h tdb_private.h-20070220022425-m1wibgjq7n5hahs6-10 lib/tdb/common/transaction.c transaction.c-20070220022425-m1wibgjq7n5hahs6-11 lib/tdb/common/traverse.c traverse.c-20070220022425-m1wibgjq7n5hahs6-12 lib/tdb/config.guess config.guess-20070125040949-7t3f5zdl1q4z9hyv-62 lib/tdb/config.sub config.sub-20070125040949-7t3f5zdl1q4z9hyv-64 lib/tdb/include/tdb.h tdb.h-20070125040949-7t3f5zdl1q4z9hyv-101 lib/tdb/swig/tdb.i tdb.i-20070125040949-7t3f5zdl1q4z9hyv-103 lib/tdb/tools/tdbbackup.c tdbbackup.c-20070125040949-7t3f5zdl1q4z9hyv-105 lib/tdb/tools/tdbdump.ctdbdump.c-20070125040949-7t3f5zdl1q4z9hyv-106 lib/tdb/tools/tdbtool.ctdbtool.c-20070125040949-7t3f5zdl1q4z9hyv-108 Diff too large for email (252, the limit is 200).
Rev 572: update lib/events from samba4 (If-if) in http://samba.org/~tridge/ctdb
revno: 572
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Tue 2007-07-10 15:34:00 +1000
message:
update lib/events from samba4 (If-if)
modified:
lib/events/events.cevents.c-20061117234101-o3qt14umlg9en8z0-26
lib/events/events.hevents.h-20061117234101-o3qt14umlg9en8z0-27
lib/events/events_aio.cevents_aio.c-20070501213746-4fxluwiq4rcxib8p-1
lib/events/events_epoll.c
events_epoll.c-20070501213746-4fxluwiq4rcxib8p-2
lib/events/events_internal.h
events_internal.h-20061117234101-o3qt14umlg9en8z0-28
lib/events/events_liboop.c
events_liboop.c-20061117234101-o3qt14umlg9en8z0-29
lib/events/events_select.c
events_select.c-20070501213746-4fxluwiq4rcxib8p-3
lib/events/events_signal.c
events_signal.c-20070501213746-4fxluwiq4rcxib8p-4
lib/events/events_standard.c
events_standard.c-20061117234101-o3qt14umlg9en8z0-30
lib/events/events_timed.c
events_timed.c-20070501213746-4fxluwiq4rcxib8p-5
=== modified file 'lib/events/events.c'
--- a/lib/events/events.c 2007-07-10 05:29:31 +
+++ b/lib/events/events.c 2007-07-10 05:34:00 +
@@ -14,7 +14,7 @@
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/.
+ along with this program. If not, see http://www.gnu.org/licenses/.
*/
/*
=== modified file 'lib/events/events.h'
--- a/lib/events/events.h 2007-07-10 05:29:31 +
+++ b/lib/events/events.h 2007-07-10 05:34:00 +
@@ -16,7 +16,7 @@
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/.
+ along with this program. If not, see http://www.gnu.org/licenses/.
*/
#ifndef __EVENTS_H__
=== modified file 'lib/events/events_aio.c'
--- a/lib/events/events_aio.c 2007-07-10 05:29:31 +
+++ b/lib/events/events_aio.c 2007-07-10 05:34:00 +
@@ -18,7 +18,7 @@
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/.
+ along with this program. If not, see http://www.gnu.org/licenses/.
*/
/*
this is a very strange beast. The Linux AIO implementation doesn't
=== modified file 'lib/events/events_epoll.c'
--- a/lib/events/events_epoll.c 2007-07-10 05:29:31 +
+++ b/lib/events/events_epoll.c 2007-07-10 05:34:00 +
@@ -17,7 +17,7 @@
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/.
+ along with this program. If not, see http://www.gnu.org/licenses/.
*/
#include includes.h
=== modified file 'lib/events/events_internal.h'
--- a/lib/events/events_internal.h 2007-07-10 05:29:31 +
+++ b/lib/events/events_internal.h 2007-07-10 05:34:00 +
@@ -18,7 +18,7 @@
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/.
+ along with this program. If not, see http://www.gnu.org/licenses/.
*/
struct event_ops {
=== modified file 'lib/events/events_liboop.c'
--- a/lib/events/events_liboop.c2007-07-10 05:29:31 +
+++ b/lib/events/events_liboop.c2007-07-10 05:34:00 +
@@ -16,7 +16,7 @@
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/.
+ along with this program. If not, see http://www.gnu.org/licenses/.
*/
#include includes.h
=== modified file 'lib/events/events_select.c'
--- a/lib/events/events_select.c2007-07-10 05:29:31 +
+++ b/lib/events/events_select.c2007-07-10 05:34:00 +
@@ -15,7 +15,7 @@
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/.
+ along with this program. If not, see http://www.gnu.org/licenses/.
*/
/*
=== modified file 'lib/events/events_signal.c'
--- a/lib/events/events_signal.c2007-07-10 05:29:31 +
+++ b/lib/events/events_signal.c2007-07-10 05:34:00 +
@@ -16,7 +16,7 @@
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/.
+ along with this program. If not, see http://www.gnu.org/licenses/.
*/
#include includes.h
===
Rev 569: merge from ronnie in http://samba.org/~tridge/ctdb
revno: 569 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Tue 2007-07-10 14:59:23 +1000 message: merge from ronnie modified: config/events.d/60.nfs nfs-20070601141008-hy3h4qgbk1jd2jci-1 server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1 tools/ctdb.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1 web/nfs.html nfs.html-20070608234340-a8i1dxro7a7i6jz6-1 revno: 432.1.121 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Tue 2007-07-10 13:09:35 +1000 message: use the socketkiller to kill off all lock manager sessions as well revno: 432.1.120 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Tue 2007-07-10 12:43:46 +1000 message: update the documentation for NFS to mention that the lock manager must run on the same port on all nodes. remove the CTDB_MANAGES_NFSLOCK variable that is no longer used revno: 432.1.119 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Tue 2007-07-10 10:24:20 +1000 message: make it possible to specify how many times ctdb killtcp will try to RST the tcp connection change the 60.nfs script to run ctdb killtcp in the foreground so we dont get lots of these running in parallel when there are a lot of tcp connections to rst revno: 432.1.118 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Tue 2007-07-10 10:07:26 +1000 message: run the ctdb killtcp in the background revno: 432.1.117 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Tue 2007-07-10 09:45:14 +1000 message: dont restart the tcp service after a ip takeover, it is more efficient to just kill off the tcp connections revno: 432.1.116 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Mon 2007-07-09 17:40:15 +1000 message: nicer handling of DISCONNECTED flag when we update the node flags from a remote message revno: 432.1.115 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Mon 2007-07-09 13:21:17 +1000 message: when a remote node has sent us a message to update the flags for a node, dont let those messages modify the DISCONNECTED flag. the DISCONNECTED flag must be managed locally since it describes whether the local node can communicate with the remote node or not revno: 432.1.114 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Mon 2007-07-09 12:55:15 +1000 message: a better way to fix the DISCONNECT|BANNED vs DISCONNECT bug revno: 432.1.113 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Mon 2007-07-09 12:33:00 +1000 message: when checking the nodemap flags for consitency while monitoring the cluster, we cant check that both the BANNED and the DISCONNECTED flags are both set at the same time since if a node becomes banned just before it is DISCONNECTED there is no guarantee that all other nodes will have seen the BANNED flag. So we must first check the DISCONNECTED flag only and only if the DISCONNECTED flag is not set should we check the BANNED flag. othervise this can cause a recovery loop while some nodes thing the disconnected node is DISCONNECTED|BANNED and other think it is just DISCONNECTED
Rev 570: update lib/replace from samba4 in http://samba.org/~tridge/ctdb
revno: 570 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Tue 2007-07-10 15:29:31 +1000 message: update lib/replace from samba4 modified: client/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1 common/cmdline.c cmdline.c-20070416041216-w1zvz91bkdsgjckw-1 common/ctdb_io.c ctdb_io.c-20070409200335-dzfc7f3rra5rcf60-1 common/ctdb_ltdb.c ctdb_ltdb.c-20061128065342-to93h6eejj5kon81-2 common/ctdb_message.c ctdb_message.c-20070208224107-9dnio7x7z33prrmt-1 common/ctdb_util.c ctdb_util.c-20061128065342-to93h6eejj5kon81-3 common/system.csystem.c-20070525071636-a5n1ihghjtppy08r-3 config.guess config.guess-20061117234101-o3qt14umlg9en8z0-4 config.sub config.sub-20061117234101-o3qt14umlg9en8z0-8 doc/ctdb.1 ctdb.1-20070609004027-2618fsab2br6vqha-1 doc/ctdb.1.xml ctdb.1.xml-20070608070258-bjuf7701h1qc1b05-2 doc/ctdbd.1ctdbd.1-20070610004249-06awdka4n3gyea3w-1 doc/ctdbd.1.xmlctdbd.1.xml-20070610004256-jh1qq0ws5zidbmbq-1 doc/onnode.1 onnode.1-20070612034208-luzwhe1cwikujzr2-1 doc/onnode.1.xml onnode.1.xml-20070612034211-klifta2rlri1lw74-1 ib/ibw_ctdb.c ibw_ctdb.c-20070102171255-7krov7858dqza466-1 ib/ibw_ctdb.h ibw_ctdb.h-20070102171259-nmuvtzt98aqzg7xp-1 ib/ibw_ctdb_init.c ibw_ctdb_init.c-20070102171305-cn2z4k7ibx8141d5-1 ib/ibwrapper.c ibwrapper.c-20061204130028-0125b4f5a72f4b11 ib/ibwrapper.h ibwrapper.h-20061204130028-32755c6266dd3c49 ib/ibwrapper_internal.h ibwrapper_internal.h-20061204130028-47f0a7e658b16ca2 ib/ibwrapper_test.c ibwrapper_test.c-20061214171730-h11a2z5ed6pt66hj-1 include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 lib/events/events.cevents.c-20061117234101-o3qt14umlg9en8z0-26 lib/events/events.hevents.h-20061117234101-o3qt14umlg9en8z0-27 lib/events/events_aio.cevents_aio.c-20070501213746-4fxluwiq4rcxib8p-1 lib/events/events_epoll.c events_epoll.c-20070501213746-4fxluwiq4rcxib8p-2 lib/events/events_internal.h events_internal.h-20061117234101-o3qt14umlg9en8z0-28 lib/events/events_liboop.c events_liboop.c-20061117234101-o3qt14umlg9en8z0-29 lib/events/events_select.c events_select.c-20070501213746-4fxluwiq4rcxib8p-3 lib/events/events_signal.c events_signal.c-20070501213746-4fxluwiq4rcxib8p-4 lib/events/events_standard.c events_standard.c-20061117234101-o3qt14umlg9en8z0-30 lib/events/events_timed.c events_timed.c-20070501213746-4fxluwiq4rcxib8p-5 lib/replace/Makefile.inmakefile.in-20070125040949-7t3f5zdl1q4z9hyv-5 lib/replace/config.guess config.guess-20070125040949-7t3f5zdl1q4z9hyv-10 lib/replace/config.sub config.sub-20070125040949-7t3f5zdl1q4z9hyv-12 lib/replace/dlfcn.cdlfcn.c-20070125040949-7t3f5zdl1q4z9hyv-14 lib/replace/dlfcn.m4 dlfcn.m4-20070125040949-7t3f5zdl1q4z9hyv-15 lib/replace/getpass.c getpass.c-20070125040949-7t3f5zdl1q4z9hyv-16 lib/replace/libreplace_cc.m4 libreplace_cc.m4-20070125040949-7t3f5zdl1q4z9hyv-21 lib/replace/repdir_getdents.c repdir_getdents.c-20070125040949-7t3f5zdl1q4z9hyv-24 lib/replace/repdir_getdirentries.c repdir_getdirentries-20070125040949-7t3f5zdl1q4z9hyv-25 lib/replace/replace.c replace.c-20070125040949-7t3f5zdl1q4z9hyv-26 lib/replace/replace.h replace.h-20070125040949-7t3f5zdl1q4z9hyv-27 lib/replace/strptime.c strptime.c-20070501213746-4fxluwiq4rcxib8p-6 lib/replace/system/aio.h aio.h-20070125040949-7t3f5zdl1q4z9hyv-75 lib/replace/system/capability.h capability.h-20070125040949-7t3f5zdl1q4z9hyv-76 lib/replace/system/dir.h dir.h-20070125040949-7t3f5zdl1q4z9hyv-78 lib/replace/system/filesys.h filesys.h-20070125040949-7t3f5zdl1q4z9hyv-79 lib/replace/system/glob.h glob.h-20070125040949-7t3f5zdl1q4z9hyv-80 lib/replace/system/iconv.h iconv.h-20070125040949-7t3f5zdl1q4z9hyv-81 lib/replace/system/kerberos.h kerberos.h-20070125040949-7t3f5zdl1q4z9hyv-82 lib/replace/system/locale.hlocale.h-20070125040949-7t3f5zdl1q4z9hyv-83 lib/replace/system/network.h network.h-20070125040949-7t3f5zdl1q4z9hyv-84 lib/replace/system/passwd.hpasswd.h-20070125040949-7t3f5zdl1q4z9hyv-85 lib/replace/system/printing.h printing.h-20070125040949-7t3f5zdl1q4z9hyv-86 lib/replace/system/readline.h readline.h-20070125040949-7t3f5zdl1q4z9hyv-87 lib/replace/system/select.hselect.h-20070125040949-7t3f5zdl1q4z9hyv-88
