Rev 531: fixed testparm calls in http://samba.org/~tridge/ctdb
revno: 531
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Mon 2007-06-11 13:56:50 +1000
message:
fixed testparm calls
modified:
config/events.d/50.samba samba-20070601105340-vlcvnp6euoj3zdwy-3
=== modified file 'config/events.d/50.samba'
--- a/config/events.d/50.samba 2007-06-06 09:46:25 +
+++ b/config/events.d/50.samba 2007-06-11 03:56:50 +
@@ -14,7 +14,7 @@
case $cmd in
startup)
# wait for all shared directories to become available
- smb_dirs=`testparm -st 2> /dev/null | egrep '^\s*path = ' | cut -d=
-f2`
+ smb_dirs=`testparm -s 2> /dev/null | egrep '^\s*path = ' | cut -d= -f2`
ctdb_wait_directories "Samba" $smb_dirs
# make sure samba is not already started
@@ -28,7 +28,7 @@
service winbind start
# wait for the Samba tcp ports to become available
- smb_ports=`testparm -stv 2> /dev/null | egrep '\s*smb ports =' | cut
-d= -f2`
+ smb_ports=`testparm -sv 2> /dev/null | egrep '\s*smb ports =' | cut -d=
-f2`
ctdb_wait_tcp_ports "Samba" $smb_ports
;;
@@ -52,15 +52,15 @@
;;
monitor)
- testparm -st 2>&1 | egrep '^WARNING|^ERROR|^Unknown' && {
+ testparm -s 2>&1 | egrep '^WARNING|^ERROR|^Unknown' && {
echo "`date` ERROR: testparm shows smb.conf is not clean"
exit 1
}
- smb_dirs=`testparm -st 2> /dev/null | egrep '^\s*path = ' | cut -d=
-f2`
+ smb_dirs=`testparm -s 2> /dev/null | egrep '^\s*path = ' | cut -d= -f2`
ctdb_check_directories "Samba" $smb_dirs
- smb_ports=`testparm -stv 2> /dev/null | egrep '\s*smb ports =' | cut
-d= -f2`
+ smb_ports=`testparm -sv 2> /dev/null | egrep '\s*smb ports =' | cut -d=
-f2`
ctdb_check_tcp_ports "Samba" $smb_ports
;;
svn commit: samba r23412 - in branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules: .
Author: abartlet Date: 2007-06-11 03:45:56 + (Mon, 11 Jun 2007) New Revision: 23412 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23412 Log: We don't need hdb.h here any more Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c Changeset: Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c === --- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c 2007-06-11 00:05:48 UTC (rev 23411) +++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c 2007-06-11 03:45:56 UTC (rev 23412) @@ -45,7 +45,6 @@ #include "system/time.h" #include "dsdb/samdb/samdb.h" #include "dsdb/common/flags.h" -#include "hdb.h" #include "dsdb/samdb/ldb_modules/password_modules.h" #include "librpc/ndr/libndr.h" #include "librpc/gen_ndr/ndr_drsblobs.h"
Rev 530: layout copyright using a literal in http://samba.org/~tridge/ctdb
revno: 530 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Mon 2007-06-11 12:50:38 +1000 message: layout copyright using a literal modified: doc/ctdb.1 ctdb.1-20070609004027-2618fsab2br6vqha-1 doc/ctdb.1.htmlctdb.1.html-20070609004024-w2r7qblwi5s3iw4a-1 doc/ctdb.1.xml ctdb.1.xml-20070608070258-bjuf7701h1qc1b05-2 doc/ctdbd.1ctdbd.1-20070610004249-06awdka4n3gyea3w-1 doc/ctdbd.1.html ctdbd.1.html-20070610004253-y2xxgjfgnpsucekc-1 doc/ctdbd.1.xmlctdbd.1.xml-20070610004256-jh1qq0ws5zidbmbq-1 Diff too large for email (760, the limit is 200).
Rev 529: use gzip --rsyncable for ctdb packages in http://samba.org/~tridge/ctdb
revno: 529
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Mon 2007-06-11 12:30:32 +1000
message:
use gzip --rsyncable for ctdb packages
modified:
packaging/RPM/ctdb.specctdb.spec-20070527204758-biuh7znabuwan3zn-3
packaging/RPM/makerpms.sh makerpms.sh-20070527204758-biuh7znabuwan3zn-4
=== modified file 'packaging/RPM/ctdb.spec'
--- a/packaging/RPM/ctdb.spec 2007-06-10 00:45:52 +
+++ b/packaging/RPM/ctdb.spec 2007-06-11 02:30:32 +
@@ -5,13 +5,13 @@
Packager: Samba Team <[EMAIL PROTECTED]>
Name: ctdb
Version: 1.0
-Release: 4
+Release: 5
Epoch: 0
License: GNU GPL version 2
Group: System Environment/Daemons
URL: http://ctdb.samba.org/
-Source: ctdb-%{version}.tar.bz2
+Source: ctdb-%{version}.tar.gz
Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall
Prereq: fileutils sed /etc/init.d
=== modified file 'packaging/RPM/makerpms.sh'
--- a/packaging/RPM/makerpms.sh 2007-06-06 01:12:14 +
+++ b/packaging/RPM/makerpms.sh 2007-06-11 02:30:32 +
@@ -59,8 +59,8 @@
ln -s $BASEDIR ctdb-${VERSION} || exit 1
REMOVE_LN=$PWD/ctdb-$VERSION
fi
-echo -n "Creating ctdb-${VERSION}.tar.bz2 ... "
-tar --exclude=.bzr --exclude .bzrignore --exclude="*~" -cf - ctdb-${VERSION}/.
| bzip2 > ${SRCDIR}/ctdb-${VERSION}.tar.bz2
+echo -n "Creating ctdb-${VERSION}.tar.gz ... "
+tar --exclude=.bzr --exclude .bzrignore --exclude="*~" -cf - ctdb-${VERSION}/.
| gzip -9 --rsyncable > ${SRCDIR}/ctdb-${VERSION}.tar.gz
echo "Done."
if [ $? -ne 0 ]; then
echo "Build failed!"
Rev 11184: The registry library compiles again. in file:///home/jelmer/bzr.samba-old/4.0-regwrite/
At file:///home/jelmer/bzr.samba-old/4.0-regwrite/
revno: 11184
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 4.0-regwrite
timestamp: Mon 2007-06-11 01:47:55 +0200
message:
The registry library compiles again.
modified:
source/lib/registry/tools/regshell.c svn-v2:[EMAIL PROTECTED]
=== modified file 'source/lib/registry/tools/regshell.c'
--- a/source/lib/registry/tools/regshell.c 2007-06-10 22:26:52 +
+++ b/source/lib/registry/tools/regshell.c 2007-06-10 23:47:55 +
@@ -27,7 +27,13 @@
#include "lib/smbreadline/smbreadline.h"
#include "librpc/gen_ndr/ndr_security.h"
-/*
+struct regshell_context {
+ struct registry_context *registry;
+ const char *path;
+ struct registry_key *current;
+};
+
+/* *
* ck/cd - change key
* ls - list values/keys
* rmval/rm - remove value
@@ -41,10 +47,7 @@
* exit
*/
-static struct registry_key *cmd_info(TALLOC_CTX *mem_ctx,
-struct
registry_context *ctx,
-struct
registry_key *cur,
-int
argc, char **argv)
+static WERROR cmd_info(struct regshell_context *ctx, int argc, char **argv)
{
struct security_descriptor *sec_desc = NULL;
time_t last_mod;
@@ -52,34 +55,32 @@
const char *classname;
NTTIME last_change;
- error = reg_key_get_info(mem_ctx, cur,
-&classname, NULL, NULL, &last_change);
+ error = reg_key_get_info(ctx, ctx->current, &classname, NULL, NULL,
&last_change);
if (!W_ERROR_IS_OK(error)) {
printf("Error getting key info: %s\n", win_errstr(error));
- return cur;
+ return error;
}
- printf("Name: %s\n", cur->name);
- printf("Full path: %s\n", cur->path);
+ printf("Name: %s\n", strchr(ctx->path, '\\')?strrchr(ctx->path,
'\\')+1:
+ ctx->path);
+ printf("Full path: %s\n", ctx->path);
printf("Key Class: %s\n", classname);
last_mod = nt_time_to_unix(last_change);
printf("Time Last Modified: %s\n", ctime(&last_mod));
- error = reg_get_sec_desc(mem_ctx, cur, &sec_desc);
+ error = reg_get_sec_desc(ctx, ctx->current, &sec_desc);
if (!W_ERROR_IS_OK(error)) {
printf("Error getting security descriptor\n");
- return cur;
+ return error;
}
ndr_print_debug((ndr_print_fn_t)ndr_print_security_descriptor,
"Security", sec_desc);
talloc_free(sec_desc);
- return cur;
+
+ return WERR_OK;
}
-static struct registry_key *cmd_predef(TALLOC_CTX *mem_ctx,
-
struct registry_context *ctx,
-
struct registry_key *cur,
- int
argc, char **argv)
+static WERROR cmd_predef(struct regshell_context *ctx, int argc, char **argv)
{
struct registry_key *ret = NULL;
if (argc < 2) {
@@ -87,71 +88,71 @@
} else if (!ctx) {
fprintf(stderr, "No full registry loaded, no predefined keys
defined\n");
} else {
- WERROR error = reg_get_predefined_key_by_name(ctx, argv[1],
&ret);
+ WERROR error = reg_get_predefined_key_by_name(ctx->registry,
argv[1], &ret);
if (!W_ERROR_IS_OK(error)) {
fprintf(stderr, "Error opening predefined key %s:
%s\n", argv[1], win_errstr(error));
- ret = NULL;
+ return error;
}
}
- return ret;
+
+ return WERR_OK;
}
-static struct registry_key *cmd_pwd(TALLOC_CTX *mem_ctx,
- struct
registry_context *ctx,
- struct
registry_key *cur,
+static WERROR cmd_pwd(struct regshell_context *ctx,
int
argc, char **argv)
{
- printf("%s\n", cur->path);
- return cur;
+ printf("%s\n", ctx->path);
+ return WERR_OK;
}
-static struct registry_key *cmd_set(TALLOC_CTX *mem_ctx, struct
registry_context *ctx,struct registry_key *cur, int argc, char **argv)
+static WERROR cmd_set(struct regshell_context *ctx, int argc, char **argv)
{
struct registry_value val;
WERROR error;
if (argc < 4) {
fprintf(stderr, "Usage: set value-name type value\n");
- return cur;
+ return WERR
Rev 11183: More work getting samba to compile again. in file:///home/jelmer/bzr.samba-old/4.0-regwrite/
At file:///home/jelmer/bzr.samba-old/4.0-regwrite/
revno: 11183
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 4.0-regwrite
timestamp: Mon 2007-06-11 00:26:52 +0200
message:
More work getting samba to compile again.
modified:
source/lib/registry/hive.h hive.h-20070423140448-w1nvzs8d2qxvyswz-1
source/lib/registry/interface.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/patchfile.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/patchfile_dotreg.c
patchfile_dotreg.c-20070114041738-0dfmkdtsa8bfu20l-1
source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED]
source/lib/registry/tests/generic.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tools/regshell.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tools/regtree.c svn-v2:[EMAIL PROTECTED]
source/lib/util/become_daemon.c svn-v2:[EMAIL PROTECTED]
source/rpc_server/winreg/rpc_winreg.c svn-v2:[EMAIL PROTECTED]
source/scripting/ejs/smbcalls_ldb.c svn-v2:[EMAIL PROTECTED]
source/smbd/server.c svn-v2:[EMAIL PROTECTED]
source/torture/ndr/winreg.csvn-v2:[EMAIL PROTECTED]
=== modified file 'source/lib/registry/hive.h'
--- a/source/lib/registry/hive.h2007-06-02 15:25:04 +
+++ b/source/lib/registry/hive.h2007-06-10 22:26:52 +
@@ -140,7 +140,8 @@
const struct hive_key
*key,
const char **classname,
uint32_t *num_subkeys,
- uint32_t *num_values);
+ uint32_t *num_values,
+ NTTIME
*last_change_time);
};
struct cli_credentials;
=== modified file 'source/lib/registry/interface.c'
--- a/source/lib/registry/interface.c 2007-06-02 15:25:04 +
+++ b/source/lib/registry/interface.c 2007-06-10 22:26:52 +
@@ -108,7 +108,7 @@
return WERR_NOT_SUPPORTED;
}
- return parent->context->ops->open_key(parent, name, result);
+ return parent->context->ops->open_key(mem_ctx, parent, name, result);
}
/**
@@ -138,7 +138,8 @@
const struct
registry_key *key,
const char
**classname,
uint32_t
*num_subkeys,
-uint32_t
*num_values)
+uint32_t
*num_values,
+NTTIME
*last_change_time)
{
if (key == NULL)
return WERR_INVALID_PARAM;
@@ -148,7 +149,7 @@
return key->context->ops->get_key_info(mem_ctx,
key, classname, num_subkeys,
-
num_values);
+
num_values, last_change_time);
}
/**
@@ -203,7 +204,11 @@
/**
* Add a key.
*/
-_PUBLIC_ WERROR reg_key_add_name(TALLOC_CTX *mem_ctx, struct registry_key
*parent, const char *name, const char *key_class, struct security_descriptor
*desc, struct registry_key **newkey)
+_PUBLIC_ WERROR reg_key_add_name(TALLOC_CTX *mem_ctx,
+struct
registry_key *parent,
+const char
*name, const char *key_class,
+struct
security_descriptor *desc,
+struct
registry_key **newkey)
{
if (parent == NULL)
return WERR_INVALID_PARAM;
=== modified file 'source/lib/registry/patchfile.c'
--- a/source/lib/registry/patchfile.c 2007-06-08 21:56:52 +
+++ b/source/lib/registry/patchfile.c 2007-06-10 22:26:52 +
@@ -48,7 +48,8 @@
uint32_t num_subkeys, num_values;
W_ERROR_NOT_OK_RETURN(
- reg_key_get_info(mem_ctx, oldkey, NULL, &num_subkeys,
&num_values));
+ reg_key_get_info(mem_ctx, oldkey, NULL, &num_subkeys,
&num_values,
+NULL));
/* Subkeys that were deleted */
for (i = 0; i < num_subkeys; i++) {
@@ -347,7 +348,8 @@
W_ERROR_NOT_OK_RETURN(reg_key_get_info(ctx, key,
NULL,
Rev 11182: More work getting the code back into something that compiles. in file:///home/jelmer/bzr.samba-old/4.0-regwrite/
At file:///home/jelmer/bzr.samba-old/4.0-regwrite/ revno: 11182 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Jelmer Vernooij <[EMAIL PROTECTED]> branch nick: 4.0-regwrite timestamp: Fri 2007-06-08 23:56:52 +0200 message: More work getting the code back into something that compiles. modified: source/lib/registry/dir.c svn-v2:[EMAIL PROTECTED] source/lib/registry/ldb.c svn-v2:[EMAIL PROTECTED] source/lib/registry/local.clocal.c-20070602140117-9a3wth1mhbrq7ej1-2 source/lib/registry/patchfile.c svn-v2:[EMAIL PROTECTED] source/lib/registry/patchfile.h patchfile.h-20070114042251-5vdjfgtpg0jx02zh-1 source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED] source/lib/registry/rpc.c svn-v2:[EMAIL PROTECTED] source/lib/registry/tools/regpatch.c svn-v2:[EMAIL PROTECTED] source/lib/registry/tools/regshell.c svn-v2:[EMAIL PROTECTED] source/lib/registry/tools/regtree.c svn-v2:[EMAIL PROTECTED] source/lib/registry/util.c svn-v2:[EMAIL PROTECTED] Diff too large for email (1315 lines, the limit is 1000).
Rev 11181: Fix compilation of some more hive backends. in file:///home/jelmer/bzr.samba-old/4.0-regwrite/
At file:///home/jelmer/bzr.samba-old/4.0-regwrite/ revno: 11181 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Jelmer Vernooij <[EMAIL PROTECTED]> branch nick: 4.0-regwrite timestamp: Sat 2007-06-02 17:25:04 +0200 message: Fix compilation of some more hive backends. modified: source/lib/registry/creg.c svn-v2:[EMAIL PROTECTED] source/lib/registry/hive.h hive.h-20070423140448-w1nvzs8d2qxvyswz-1 source/lib/registry/interface.c svn-v2:[EMAIL PROTECTED] source/lib/registry/ldb.c svn-v2:[EMAIL PROTECTED] source/lib/registry/local.clocal.c-20070602140117-9a3wth1mhbrq7ej1-2 source/lib/registry/regf.c svn-v2:[EMAIL PROTECTED] source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED] Diff too large for email (1116 lines, the limit is 1000).
Rev 11180: More work on the registry API: in file:///home/jelmer/bzr.samba-old/4.0-regwrite/
At file:///home/jelmer/bzr.samba-old/4.0-regwrite/ revno: 11180 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Jelmer Vernooij <[EMAIL PROTECTED]> branch nick: 4.0-regwrite timestamp: Sat 2007-06-02 16:03:25 +0200 message: More work on the registry API: * Finish API refactoring * Fix compilation of most of the core functions added: source/lib/registry/hive.c hive.c-20070602140117-9a3wth1mhbrq7ej1-1 source/lib/registry/local.clocal.c-20070602140117-9a3wth1mhbrq7ej1-2 renamed: source/lib/registry/reg_samba.c => source/lib/registry/samba.c svn-v2:[EMAIL PROTECTED] modified: source/lib/registry/README svn-v2:[EMAIL PROTECTED] source/lib/registry/config.mk svn-v2:[EMAIL PROTECTED] source/lib/registry/creg.c svn-v2:[EMAIL PROTECTED] source/lib/registry/dir.c svn-v2:[EMAIL PROTECTED] source/lib/registry/hive.h hive.h-20070423140448-w1nvzs8d2qxvyswz-1 source/lib/registry/interface.c svn-v2:[EMAIL PROTECTED] source/lib/registry/ldb.c svn-v2:[EMAIL PROTECTED] source/lib/registry/patchfile.c svn-v2:[EMAIL PROTECTED] source/lib/registry/regf.c svn-v2:[EMAIL PROTECTED] source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED] source/lib/registry/rpc.c svn-v2:[EMAIL PROTECTED] source/lib/registry/tools/regdiff.c svn-v2:[EMAIL PROTECTED] source/lib/registry/util.c svn-v2:[EMAIL PROTECTED] source/lib/registry/samba.csvn-v2:[EMAIL PROTECTED] Diff too large for email (2249 lines, the limit is 1000).
svn commit: samba r23411 - in branches: SAMBA_3_0/source/lib SAMBA_3_0_25/source/lib SAMBA_3_0_26/source/lib
Author: idra
Date: 2007-06-11 00:05:48 + (Mon, 11 Jun 2007)
New Revision: 23411
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23411
Log:
We were missing displayName and that was preventing us
from successfully deleting an entry when "account" is
the STRUCTURAL objectclass used for users and machines.
"account" is used each time the user entry is in /etc/passwd
and we have only the samba attributes in ldap, as well
as for rfc2307(bis) standard based directories.
Modified:
branches/SAMBA_3_0/source/lib/smbldap.c
branches/SAMBA_3_0_25/source/lib/smbldap.c
branches/SAMBA_3_0_26/source/lib/smbldap.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/smbldap.c
===
--- branches/SAMBA_3_0/source/lib/smbldap.c 2007-06-10 17:02:09 UTC (rev
23410)
+++ branches/SAMBA_3_0/source/lib/smbldap.c 2007-06-11 00:05:48 UTC (rev
23411)
@@ -138,6 +138,7 @@
{ LDAP_ATTR_LOGON_TIME, "sambaLogonTime"},
{ LDAP_ATTR_LOGOFF_TIME,"sambaLogoffTime" },
{ LDAP_ATTR_KICKOFF_TIME, "sambaKickoffTime" },
+ { LDAP_ATTR_DISPLAY_NAME, "displayName" },
{ LDAP_ATTR_HOME_DRIVE, "sambaHomeDrive"},
{ LDAP_ATTR_HOME_PATH, "sambaHomePath" },
{ LDAP_ATTR_LOGON_SCRIPT, "sambaLogonScript" },
Modified: branches/SAMBA_3_0_25/source/lib/smbldap.c
===
--- branches/SAMBA_3_0_25/source/lib/smbldap.c 2007-06-10 17:02:09 UTC (rev
23410)
+++ branches/SAMBA_3_0_25/source/lib/smbldap.c 2007-06-11 00:05:48 UTC (rev
23411)
@@ -138,6 +138,7 @@
{ LDAP_ATTR_LOGON_TIME, "sambaLogonTime"},
{ LDAP_ATTR_LOGOFF_TIME,"sambaLogoffTime" },
{ LDAP_ATTR_KICKOFF_TIME, "sambaKickoffTime" },
+ { LDAP_ATTR_DISPLAY_NAME, "displayName" },
{ LDAP_ATTR_HOME_DRIVE, "sambaHomeDrive"},
{ LDAP_ATTR_HOME_PATH, "sambaHomePath" },
{ LDAP_ATTR_LOGON_SCRIPT, "sambaLogonScript" },
Modified: branches/SAMBA_3_0_26/source/lib/smbldap.c
===
--- branches/SAMBA_3_0_26/source/lib/smbldap.c 2007-06-10 17:02:09 UTC (rev
23410)
+++ branches/SAMBA_3_0_26/source/lib/smbldap.c 2007-06-11 00:05:48 UTC (rev
23411)
@@ -138,6 +138,7 @@
{ LDAP_ATTR_LOGON_TIME, "sambaLogonTime"},
{ LDAP_ATTR_LOGOFF_TIME,"sambaLogoffTime" },
{ LDAP_ATTR_KICKOFF_TIME, "sambaKickoffTime" },
+ { LDAP_ATTR_DISPLAY_NAME, "displayName" },
{ LDAP_ATTR_HOME_DRIVE, "sambaHomeDrive"},
{ LDAP_ATTR_HOME_PATH, "sambaHomePath" },
{ LDAP_ATTR_LOGON_SCRIPT, "sambaLogonScript" },
Build status as of Mon Jun 11 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-06-10 00:01:30.0 + +++ /home/build/master/cache/broken_results.txt 2007-06-11 00:00:24.0 + @@ -1,4 +1,4 @@ -Build status as of Sun Jun 10 00:00:02 2007 +Build status as of Mon Jun 11 00:00:02 2007 Build counts: Tree Total Broken Panic @@ -18,8 +18,8 @@ samba-docs 0 0 0 samba-gtk4 4 0 samba4 33 21 5 -samba_3_036 16 0 +samba_3_036 13 0 smb-build33 33 0 talloc 36 8 0 -tdb 35 2 0 +tdb 34 2 0
Rev 528: merge from ronnie in http://samba.org/~tridge/ctdb
revno: 528
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Mon 2007-06-11 09:43:23 +1000
message:
merge from ronnie
modified:
config/events.d/10.interface 10.interface-20070604050809-s21zslfirn07zjt8-1
doc/ctdb.1 ctdb.1-20070609004027-2618fsab2br6vqha-1
doc/ctdb.1.htmlctdb.1.html-20070609004024-w2r7qblwi5s3iw4a-1
revno: 432.1.75
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Mon 2007-06-11 08:42:51 +1000
message:
when public interface is not set, print this to the logfile before
exiting the script
revno: 432.1.74
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Mon 2007-06-11 08:38:01 +1000
message:
minor man page update
revno: 432.1.73
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Sun 2007-06-10 17:31:52 +1000
message:
merge from tridge
=== modified file 'config/events.d/10.interface'
--- a/config/events.d/10.interface 2007-06-09 11:46:42 +
+++ b/config/events.d/10.interface 2007-06-10 23:43:23 +
@@ -8,11 +8,17 @@
. /etc/ctdb/functions
loadconfig ctdb
-[ -z "$CTDB_PUBLIC_INTERFACE" ] && exit 0
-
cmd="$1"
shift
+[ -z "$CTDB_PUBLIC_INTERFACE" ] && {
+[ "$cmd" = "startup" ] && {
+ echo "Event script $0 : CTDB_PUBLIC_INTERFACE not set. Nothing to do."
+}
+exit 0
+}
+
+
case $cmd in
#
# called when ctdbd starts up
=== modified file 'doc/ctdb.1'
--- a/doc/ctdb.12007-06-10 04:46:42 +
+++ b/doc/ctdb.12007-06-10 22:38:01 +
@@ -1,11 +1,11 @@
.\" Title: ctdb
.\"Author:
.\" Generator: DocBook XSL Stylesheets v1.71.0 ] [-Y] [-t ] [-?
--help] [--usage] [-d --debug=]
[--socket=]DESCRIPTION
- ctdb is the utility to view and manage a ctdb cluster.
+ ctdb is a utility to view and manage a ctdb cluster.
OPTIONS-n
This specifies on which node to execute the command. Default is
to run the command on the deamon running on the local host.
svn commit: lorikeet r741 - in trunk/heimdal/lib/hcrypto: .
Author: lha
Date: 2007-06-10 19:15:09 + (Sun, 10 Jun 2007)
New Revision: 741
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=741
Log:
Add .
Modified:
trunk/heimdal/lib/hcrypto/test_bn.c
Changeset:
Modified: trunk/heimdal/lib/hcrypto/test_bn.c
===
--- trunk/heimdal/lib/hcrypto/test_bn.c 2007-06-10 17:23:26 UTC (rev 740)
+++ trunk/heimdal/lib/hcrypto/test_bn.c 2007-06-10 19:15:09 UTC (rev 741)
@@ -36,7 +36,7 @@
#endif
#ifdef RCSID
-RCSID("$Id: test_bn.c 21043 2007-06-10 07:57:46Z lha $");
+RCSID("$Id: test_bn.c 21047 2007-06-10 19:11:54Z lha $");
#endif
#include
@@ -46,6 +46,7 @@
#include
#include
+#include
static int
set_get(unsigned long num)
svn commit: lorikeet r740 - in trunk/heimdal: . appl/ftp appl/ftp/ftpd cf doc kdc lib/asn1 lib/com_err lib/gssapi lib/gssapi/ntlm lib/gssapi/spnego lib/hcrypto lib/sl tests tests/can
Author: lha Date: 2007-06-10 17:23:26 + (Sun, 10 Jun 2007) New Revision: 740 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=740 Log: Merged with Heimdal svn revision 21046 Modified: trunk/heimdal/ChangeLog trunk/heimdal/Makefile.am trunk/heimdal/appl/ftp/ChangeLog trunk/heimdal/appl/ftp/ftpd/Makefile.am trunk/heimdal/cf/ChangeLog trunk/heimdal/doc/heimdal.texi trunk/heimdal/doc/hx509.texi trunk/heimdal/kdc/kerberos5.c trunk/heimdal/kdc/krb5tgs.c trunk/heimdal/kdc/pkinit.c trunk/heimdal/lib/asn1/Makefile.am trunk/heimdal/lib/com_err/Makefile.am trunk/heimdal/lib/gssapi/ChangeLog trunk/heimdal/lib/gssapi/ntlm/digest.c trunk/heimdal/lib/gssapi/spnego/context_stubs.c trunk/heimdal/lib/hcrypto/ChangeLog trunk/heimdal/lib/hcrypto/test_bn.c trunk/heimdal/lib/hcrypto/test_crypto.in trunk/heimdal/lib/hcrypto/test_engine_dso.c trunk/heimdal/lib/sl/Makefile.am trunk/heimdal/tests/ChangeLog trunk/heimdal/tests/can/check-can.in trunk/heimdal/tests/can/test_can.in Changeset: Sorry, the patch is too large (585 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=740
svn commit: samba r23410 - in branches: SAMBA_3_0/source SAMBA_3_0/source/include SAMBA_3_0/source/lib SAMBA_3_0/source/librpc/ndr SAMBA_3_0/source/nsswitch SAMBA_3_0/source/param SAMBA_3_0/source/scr
Author: vlendec Date: 2007-06-10 17:02:09 + (Sun, 10 Jun 2007) New Revision: 23410 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23410 Log: Merge the core of the cluster code. I'm 100% certain I've forgotten to merge something, but the main code should be in. It's mainly in dbwrap_ctdb.c, ctdbd_conn.c and messages_ctdbd.c. There should be no changes to the non-cluster case, it does survive make test on my laptop. It survives some very basic tests with ctdbd enables, I did not do the full test suite for clusters yet. Phew... Volker Added: branches/SAMBA_3_0/source/include/ctdbd_conn.h branches/SAMBA_3_0/source/include/packet.h branches/SAMBA_3_0/source/lib/ctdbd_conn.c branches/SAMBA_3_0/source/lib/dbwrap_ctdb.c branches/SAMBA_3_0/source/lib/messages_ctdbd.c branches/SAMBA_3_0/source/lib/packet.c branches/SAMBA_3_0_26/source/include/ctdbd_conn.h branches/SAMBA_3_0_26/source/include/packet.h branches/SAMBA_3_0_26/source/lib/ctdbd_conn.c branches/SAMBA_3_0_26/source/lib/dbwrap_ctdb.c branches/SAMBA_3_0_26/source/lib/messages_ctdbd.c branches/SAMBA_3_0_26/source/lib/packet.c Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0/source/include/includes.h branches/SAMBA_3_0/source/include/messages.h branches/SAMBA_3_0/source/include/smb.h branches/SAMBA_3_0/source/lib/dbwrap.c branches/SAMBA_3_0/source/lib/messages.c branches/SAMBA_3_0/source/lib/substitute.c branches/SAMBA_3_0/source/lib/util.c branches/SAMBA_3_0/source/librpc/ndr/ndr_misc.c branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c branches/SAMBA_3_0/source/param/loadparm.c branches/SAMBA_3_0/source/script/tests/tests_all.sh branches/SAMBA_3_0/source/smbd/oplock.c branches/SAMBA_3_0/source/smbd/server.c branches/SAMBA_3_0/source/utils/status.c branches/SAMBA_3_0_26/source/Makefile.in branches/SAMBA_3_0_26/source/configure.in branches/SAMBA_3_0_26/source/include/includes.h branches/SAMBA_3_0_26/source/include/messages.h branches/SAMBA_3_0_26/source/include/smb.h branches/SAMBA_3_0_26/source/lib/dbwrap.c branches/SAMBA_3_0_26/source/lib/messages.c branches/SAMBA_3_0_26/source/lib/substitute.c branches/SAMBA_3_0_26/source/lib/util.c branches/SAMBA_3_0_26/source/librpc/ndr/ndr_misc.c branches/SAMBA_3_0_26/source/nsswitch/winbindd_dual.c branches/SAMBA_3_0_26/source/param/loadparm.c branches/SAMBA_3_0_26/source/smbd/oplock.c branches/SAMBA_3_0_26/source/smbd/server.c branches/SAMBA_3_0_26/source/utils/status.c Changeset: Sorry, the patch is too large (5604 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23410
svn commit: samba r23409 - in branches/SAMBA_3_0_26/source: .
Author: vlendec Date: 2007-06-10 16:34:36 + (Sun, 10 Jun 2007) New Revision: 23409 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23409 Log: Fix the non-developer build Modified: branches/SAMBA_3_0_26/source/configure.in Changeset: Modified: branches/SAMBA_3_0_26/source/configure.in === --- branches/SAMBA_3_0_26/source/configure.in 2007-06-10 10:18:03 UTC (rev 23408) +++ branches/SAMBA_3_0_26/source/configure.in 2007-06-10 16:34:36 UTC (rev 23409) @@ -610,7 +610,7 @@ dnl Add modules that have to be built by default here dnl These have to be built static: -default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr rpc_reg rpc_initshutdown rpc_lsa_ds rpc_wkssvc rpc_svcctl2 rpc_ntsvcs rpc_net rpc_netdfs rpc_srvsvc2 rpc_spoolss rpc_eventlog2 rpc_rpcecho auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin vfs_default nss_info_template" +default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr rpc_reg rpc_initshutdown rpc_lsa_ds rpc_wkssvc rpc_svcctl2 rpc_ntsvcs rpc_net rpc_netdfs rpc_srvsvc2 rpc_spoolss rpc_eventlog2 auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin vfs_default nss_info_template" dnl These are preferably build shared, and static if dlopen() is not available default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy charset_CP850 charset_CP437 auth_script vfs_readahead"
svn commit: samba r23408 - in branches: SAMBA_3_0/source/lib SAMBA_3_0_26/source/lib
Author: vlendec Date: 2007-06-10 10:18:03 + (Sun, 10 Jun 2007) New Revision: 23408 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23408 Log: Remove a bogus comment Modified: branches/SAMBA_3_0/source/lib/messages_local.c branches/SAMBA_3_0_26/source/lib/messages_local.c Changeset: Modified: branches/SAMBA_3_0/source/lib/messages_local.c === --- branches/SAMBA_3_0/source/lib/messages_local.c 2007-06-09 22:45:21 UTC (rev 23407) +++ branches/SAMBA_3_0/source/lib/messages_local.c 2007-06-10 10:18:03 UTC (rev 23408) @@ -47,7 +47,6 @@ #include "librpc/gen_ndr/messaging.h" #include "librpc/gen_ndr/ndr_messaging.h" -/* the locking database handle */ static int received_signal; static NTSTATUS messaging_tdb_send(struct messaging_context *msg_ctx, Modified: branches/SAMBA_3_0_26/source/lib/messages_local.c === --- branches/SAMBA_3_0_26/source/lib/messages_local.c 2007-06-09 22:45:21 UTC (rev 23407) +++ branches/SAMBA_3_0_26/source/lib/messages_local.c 2007-06-10 10:18:03 UTC (rev 23408) @@ -47,7 +47,6 @@ #include "librpc/gen_ndr/messaging.h" #include "librpc/gen_ndr/ndr_messaging.h" -/* the locking database handle */ static int received_signal; static NTSTATUS messaging_tdb_send(struct messaging_context *msg_ctx,
Rev 527: merge from ronnie in http://samba.org/~tridge/ctdb
revno: 527 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Sun 2007-06-10 17:28:54 +1000 message: merge from ronnie added: doc/ctdbd.1ctdbd.1-20070610004249-06awdka4n3gyea3w-1 doc/ctdbd.1.html ctdbd.1.html-20070610004253-y2xxgjfgnpsucekc-1 doc/ctdbd.1.xmlctdbd.1.xml-20070610004256-jh1qq0ws5zidbmbq-1 modified: Makefile.inmakefile.in-20061117234101-o3qt14umlg9en8z0-1 doc/ctdb.1 ctdb.1-20070609004027-2618fsab2br6vqha-1 doc/ctdb.1.htmlctdb.1.html-20070609004024-w2r7qblwi5s3iw4a-1 doc/ctdb.1.xml ctdb.1.xml-20070608070258-bjuf7701h1qc1b05-2 packaging/RPM/ctdb.specctdb.spec-20070527204758-biuh7znabuwan3zn-3 web/documentation.html documentation.html-20070609045837-x3vec3l27niwxtfg-1 revno: 432.1.72 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Sun 2007-06-10 14:46:42 +1000 message: add descriptions of the options for the ctdb command revno: 432.1.71 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Sun 2007-06-10 14:28:50 +1000 message: merge from tridge revno: 432.1.70 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Sun 2007-06-10 11:03:29 +1000 message: add a link to the ctdbd man page revno: 432.1.69 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Sun 2007-06-10 10:45:52 +1000 message: initial ctdbd man page revno: 432.1.68 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Sun 2007-06-10 08:53:44 +1000 message: merge from tridge revno: 432.1.67 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Sun 2007-06-10 08:14:09 +1000 message: merge from tridge revno: 432.1.66 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Sat 2007-06-09 21:52:24 +1000 message: merge from tridge Diff too large for email (1272, the limit is 200).
