[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre3-81-g3ce3384
The branch, v3-2-stable has been updated
via 3ce33843d767aad1f01fab20ba4c2bb781f8c21a (commit)
via 7eebe088f99d401a0f5e42e1ce593bb2ea74f245 (commit)
via c32448b49036a50fc0f6d2b0a2de641144fc049f (commit)
via 5beb4e67b24c31ba8294861d71023dff78d96042 (commit)
via c8c63401423cf15ba6b56ffa80e60d4da6979a2c (commit)
from 784c80a6a3862e092050fb467c37b39d843a1353 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -
commit 3ce33843d767aad1f01fab20ba4c2bb781f8c21a
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed May 14 14:09:02 2008 -0700
Ensure we don't keep searching for sharename if it's
not the start of the list.
Jeremy.
(cherry picked from commit 4d30a6bff9ce8e826f0109e99021d6683ec4299f)
commit 7eebe088f99d401a0f5e42e1ce593bb2ea74f245
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Tue May 13 15:25:14 2008 -0700
Fix debug message.
Jeremy.
(cherry picked from commit 0a68f230cd92b97efed2b3bad19a3bf9a750d401)
commit c32448b49036a50fc0f6d2b0a2de641144fc049f
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Tue May 13 15:02:53 2008 -0700
Second part of patch for bug #5460. Cope with pathnames
that don't look like \xxx\yyy, cope with arbitrary length.
Jeremy.
(cherry picked from commit c3328a252430007cd716a406d85fd2a0bbbff607)
commit 5beb4e67b24c31ba8294861d71023dff78d96042
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Tue May 13 14:03:21 2008 -0700
Fix bug #5460. The problem is RHEL5.0 shipped a CIFS client
that sets the DFS bit on pathnames but doesn't
send DFS paths. This causes lookups to fail as
the smbd/msdfs.c code now just eats the first
two parts of the pathname and uses the rest as
the local path. The previous hostname check
used to protect us from that as we knew that
when the hostname was invalid it was a local
path (and a broken client).
I didn't want to put that check back in, but
came up with another idea - even though the
hostname can be a different one, the sharename
must be valid on this machine. So we can check
for a valid sharename instead.
Jeremy.
(cherry picked from commit 5c6ed7774220dea30c2c8a564648406b4f3eacbf)
commit c8c63401423cf15ba6b56ffa80e60d4da6979a2c
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed May 14 14:11:26 2008 -0700
Fix bug #5464. Pointed out by Herb @ Connectathon. In fork_domain_child()
we call :
CatchChild();
*before* we fork the domain child. This call establishes a signal handler
that
eats SIGCLD signals and doesn't call sys_select_signal() as the main daemon
SIGCLD handler should do. This causes the parent to ignore dead children and
time out, instead of calling winbind_child_died() on receipt of the signal.
The
correct fix is to move the CatchChild call into the child code after the
fork.
Jeremy.
(cherry picked from commit 6da910cc1c6baccbb143f0b2d347e31e9f84c35b)
---
Summary of changes:
source/smbd/conn.c | 25 +++-
source/smbd/msdfs.c | 46 +-
source/winbindd/winbindd_dual.c |6 ++--
3 files changed, 66 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/conn.c b/source/smbd/conn.c
index 5aedadc..97861ed 100644
--- a/source/smbd/conn.c
+++ b/source/smbd/conn.c
@@ -63,10 +63,10 @@ bool conn_snum_used(int snum)
return(False);
}
-
/
-find a conn given a cnum
+ Find a conn given a cnum.
/
+
connection_struct *conn_find(unsigned cnum)
{
int count=0;
@@ -84,6 +84,27 @@ connection_struct *conn_find(unsigned cnum)
return NULL;
}
+/
+ Find a conn given a service name.
+/
+
+connection_struct *conn_find_byname(const char *service)
+{
+ connection_struct *conn;
+
+ for (conn=Connections;conn;conn=conn-next) {
+ if (strequal(lp_servicename(SNUM(conn)),service)) {
+ if (conn != Connections) {
+ /* Promote if not first. */
+ DLIST_PROMOTE(Connections, conn);
+ }
+ return conn;
+ }
+ }
+
+ return NULL;
+}
+
/
find first available connection slot, starting from a random position.
diff --git a/source/smbd/msdfs.c b/source/smbd/msdfs.c
index 4f9e739..eaa66ef 100644
---
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2442-ge90a4ce
The branch, v3-3-test has been updated via e90a4ce3c24ab2a33e34da5a9052a3b3ec4db962 (commit) from 95339c0c1ecc49049f1fc176f72a1dcac639e06d (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit e90a4ce3c24ab2a33e34da5a9052a3b3ec4db962 Author: Günther Deschner [EMAIL PROTECTED] Date: Thu May 15 09:42:37 2008 +0200 Fix build warning. Guenther --- Summary of changes: source/nsswitch/libwbclient/wbc_pam.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/nsswitch/libwbclient/wbc_pam.c b/source/nsswitch/libwbclient/wbc_pam.c index a3fb212..0c1a32d 100644 --- a/source/nsswitch/libwbclient/wbc_pam.c +++ b/source/nsswitch/libwbclient/wbc_pam.c @@ -490,7 +490,6 @@ wbcErr wbcLogoffUser(const char *username, struct winbindd_request request; struct winbindd_response response; wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE; - struct passwd *pw = NULL; /* validate input */ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre3-82-g2d3f489
The branch, v3-2-stable has been updated
via 2d3f4897076663505aec23eb3ffaa1ae54cd39a5 (commit)
from 3ce33843d767aad1f01fab20ba4c2bb781f8c21a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -
commit 2d3f4897076663505aec23eb3ffaa1ae54cd39a5
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed May 14 23:50:25 2008 +0200
Fix Bug #5465 (joining with createcomputer=ou1/ou2/ou3).
Guenther
(cherry picked from commit f3251ba03a69c2fd0335861177159a32b2bc9477)
(cherry picked from commit 6d445c134d4d78f8261c998a5a83feaafb01bbca)
---
Summary of changes:
source/libads/ldap.c| 10 +-
source/libnet/libnet_join.c |3 +--
2 files changed, 6 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index 9321302..181da9e 100644
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -3595,18 +3595,18 @@ const char
*ads_get_extended_right_name_by_guid(ADS_STRUCT *ads,
ADS_STATUS ads_check_ou_dn(TALLOC_CTX *mem_ctx,
ADS_STRUCT *ads,
- const char *account_ou)
+ const char **account_ou)
{
struct ldb_dn *name_dn = NULL;
const char *name = NULL;
char *ou_string = NULL;
- name_dn = ldb_dn_explode(mem_ctx, account_ou);
+ name_dn = ldb_dn_explode(mem_ctx, *account_ou);
if (name_dn) {
return ADS_SUCCESS;
}
- ou_string = ads_ou_string(ads, account_ou);
+ ou_string = ads_ou_string(ads, *account_ou);
if (!ou_string) {
return ADS_ERROR_LDAP(LDAP_INVALID_DN_SYNTAX);
}
@@ -3623,8 +3623,8 @@ ADS_STATUS ads_check_ou_dn(TALLOC_CTX *mem_ctx,
return ADS_ERROR_LDAP(LDAP_INVALID_DN_SYNTAX);
}
- account_ou = talloc_strdup(mem_ctx, name);
- if (!account_ou) {
+ *account_ou = talloc_strdup(mem_ctx, name);
+ if (!*account_ou) {
return ADS_ERROR_LDAP(LDAP_NO_MEMORY);
}
diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index 9834a37..3f48284 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -207,7 +207,7 @@ static ADS_STATUS
libnet_join_precreate_machine_acct(TALLOC_CTX *mem_ctx,
const char *attrs[] = { dn, NULL };
bool moved = false;
- status = ads_check_ou_dn(mem_ctx, r-in.ads, r-in.account_ou);
+ status = ads_check_ou_dn(mem_ctx, r-in.ads, r-in.account_ou);
if (!ADS_ERR_OK(status)) {
return status;
}
@@ -1486,7 +1486,6 @@ static int libnet_destroy_UnjoinCtx(struct
libnet_UnjoinCtx *r)
unsetenv(KRB5_ENV_CCNAME);
}
-
return 0;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre3-84-g73c05bb
The branch, v3-2-stable has been updated via 73c05bb8b820c42c5fa820d1cdf6591feb19a244 (commit) via 2e0c41c90ba8e0d9cc857b2f07adb7ddf3cb5f31 (commit) from 2d3f4897076663505aec23eb3ffaa1ae54cd39a5 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log - commit 73c05bb8b820c42c5fa820d1cdf6591feb19a244 Author: Karolin Seeger [EMAIL PROTECTED] Date: Thu May 15 10:38:33 2008 +0200 WHATSNEW: Remove trailing whitespace. Karolin (cherry picked from commit e02673dc0f59b1d6b0ff83ba23fcaa1373ca7a6f) commit 2e0c41c90ba8e0d9cc857b2f07adb7ddf3cb5f31 Author: Karolin Seeger [EMAIL PROTECTED] Date: Thu May 15 10:36:26 2008 +0200 WHATSNEW: Update changes since 3.2.0pre3. Karolin (cherry picked from commit bbad2b9758cff53679188ff5e4fc47db3cc51d65) --- Summary of changes: WHATSNEW.txt |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 102c994..2ad51d2 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -221,6 +221,8 @@ o Jeremy Allison [EMAIL PROTECTED] * BUG 5095: Fix Manage Documents privilege. * BUG 5434: Ensure the loaded password doesn't contain the '\n' at the end. * BUG 5456: Fix missing echo if we ^C at the prompt. +* BUG 5460: Fix DFS referrals. +* BUG 5464: Fix timeout in winbindd. * Fix returning a directory value for a QPATHINFO on a msdfs link with a non-dfs path. @@ -230,6 +232,7 @@ o Alexander Bokovoy [EMAIL PROTECTED] o Günther Deschner [EMAIL PROTECTED] +* BUG 5465: Fix joining with createcomputer=ou1/ou2/ou3. * Fix wins null pointer crash in nss_wins module. * Fix lm session key length in _netr_LogonSamLogon. * Add -f switch for DsGetDCName() example and be more verbose on output. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2329-ge02673d
The branch, v3-2-test has been updated via e02673dc0f59b1d6b0ff83ba23fcaa1373ca7a6f (commit) via bbad2b9758cff53679188ff5e4fc47db3cc51d65 (commit) from 6d445c134d4d78f8261c998a5a83feaafb01bbca (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit e02673dc0f59b1d6b0ff83ba23fcaa1373ca7a6f Author: Karolin Seeger [EMAIL PROTECTED] Date: Thu May 15 10:38:33 2008 +0200 WHATSNEW: Remove trailing whitespace. Karolin commit bbad2b9758cff53679188ff5e4fc47db3cc51d65 Author: Karolin Seeger [EMAIL PROTECTED] Date: Thu May 15 10:36:26 2008 +0200 WHATSNEW: Update changes since 3.2.0pre3. Karolin --- Summary of changes: WHATSNEW.txt |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 102c994..2ad51d2 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -221,6 +221,8 @@ o Jeremy Allison [EMAIL PROTECTED] * BUG 5095: Fix Manage Documents privilege. * BUG 5434: Ensure the loaded password doesn't contain the '\n' at the end. * BUG 5456: Fix missing echo if we ^C at the prompt. +* BUG 5460: Fix DFS referrals. +* BUG 5464: Fix timeout in winbindd. * Fix returning a directory value for a QPATHINFO on a msdfs link with a non-dfs path. @@ -230,6 +232,7 @@ o Alexander Bokovoy [EMAIL PROTECTED] o Günther Deschner [EMAIL PROTECTED] +* BUG 5465: Fix joining with createcomputer=ou1/ou2/ou3. * Fix wins null pointer crash in nss_wins module. * Fix lm session key length in _netr_LogonSamLogon. * Add -f switch for DsGetDCName() example and be more verbose on output. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre3-85-g7191071
The branch, v3-2-stable has been updated
via 7191071943868d668fae93403e7f86c719afae89 (commit)
from 73c05bb8b820c42c5fa820d1cdf6591feb19a244 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -
commit 7191071943868d668fae93403e7f86c719afae89
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon May 5 16:58:24 2008 +0200
Fix client authentication with -P switch in client tools (Bug 5435).
Guenther
(cherry picked from commit d077ef64cd1d9bbaeb936566c2c70da508de829f)
---
Summary of changes:
source/client/client.c |5
source/include/popt_common.h |1 +
source/lib/popt_common.c | 30 +
source/lib/util.c| 49 +-
source/libsmb/cliconnect.c | 22 +-
source/rpcclient/rpcclient.c | 15 -
source/utils/smbcacls.c | 14 +++-
source/utils/smbcquotas.c| 15 -
source/utils/smbtree.c |6 +
9 files changed, 122 insertions(+), 35 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/client.c b/source/client/client.c
index 276ffb9..e08fa89 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -4875,6 +4875,11 @@ static int do_message_op(void)
argv[0], get_dyn_CONFIGFILE());
}
+ if (get_cmdline_auth_info_use_machine_account()
+ !set_cmdline_auth_info_machine_account_creds()) {
+ exit(-1);
+ }
+
load_interfaces();
if (service_opt service) {
diff --git a/source/include/popt_common.h b/source/include/popt_common.h
index 9e5503f..c889d2e 100644
--- a/source/include/popt_common.h
+++ b/source/include/popt_common.h
@@ -50,6 +50,7 @@ struct user_auth_info {
bool use_kerberos;
int signing_state;
bool smb_encrypt;
+ bool use_machine_account;
};
#endif /* _POPT_COMMON_H */
diff --git a/source/lib/popt_common.c b/source/lib/popt_common.c
index 8f0f7c6..25e41ab 100644
--- a/source/lib/popt_common.c
+++ b/source/lib/popt_common.c
@@ -514,35 +514,7 @@ static void popt_common_credentials_callback(poptContext
con,
}
break;
case 'P':
- {
- char *opt_password = NULL;
- char *pwd = NULL;
-
- /* it is very useful to be able to make ads queries as
the
- machine account for testing purposes and for domain
leave */
-
- if (!secrets_init()) {
- d_printf(ERROR: Unable to open secrets
database\n);
- exit(1);
- }
-
- opt_password =
secrets_fetch_machine_password(lp_workgroup(), NULL, NULL);
-
- if (!opt_password) {
- d_printf(ERROR: Unable to fetch machine
password\n);
- exit(1);
- }
- if (asprintf(pwd, %s$, global_myname()) 0) {
- exit(ENOMEM);
- }
- set_cmdline_auth_info_username(pwd);
- set_cmdline_auth_info_password(opt_password);
- SAFE_FREE(pwd);
- SAFE_FREE(opt_password);
-
- /* machine accounts only work with kerberos */
- set_cmdline_auth_info_use_krb5_ticket();
- }
+ set_cmdline_auth_info_use_machine_account();
break;
case 'N':
set_cmdline_auth_info_password();
diff --git a/source/lib/util.c b/source/lib/util.c
index 953981e..5f95bcc 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -291,7 +291,8 @@ static struct user_auth_info cmdline_auth_info = {
false, /* got_pass */
false, /* use_kerberos */
Undefined, /* signing state */
- false /* smb_encrypt */
+ false, /* smb_encrypt */
+ false /* use machine account */
};
const char *get_cmdline_auth_info_username(void)
@@ -370,6 +371,11 @@ void set_cmdline_auth_info_smb_encrypt(void)
cmdline_auth_info.smb_encrypt = true;
}
+void set_cmdline_auth_info_use_machine_account(void)
+{
+ cmdline_auth_info.use_machine_account = true;
+}
+
bool get_cmdline_auth_info_got_pass(void)
{
return cmdline_auth_info.got_pass;
@@ -380,6 +386,11 @@ bool get_cmdline_auth_info_smb_encrypt(void)
return cmdline_auth_info.smb_encrypt;
}
+bool get_cmdline_auth_info_use_machine_account(void)
+{
+ return cmdline_auth_info.use_machine_account;
+}
+
bool get_cmdline_auth_info_copy(struct user_auth_info *info)
{
*info = cmdline_auth_info;
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28a-1167-g4e66123
The branch, v3-0-test has been updated via 4e6612320f1c6d44e98571485f49d647a776edb2 (commit) from 9727d87e7c8748fecf7df5664320507711a7d081 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test - Log - commit 4e6612320f1c6d44e98571485f49d647a776edb2 Author: Karolin Seeger [EMAIL PROTECTED] Date: Thu May 15 15:54:20 2008 +0200 man pages: Downgrade the man pages according to the code. Karolin --- Summary of changes: docs-xml/manpages-3/smbmnt.8.xml | 118 +++ docs-xml/manpages-3/smbmount.8.xml | 344 docs-xml/manpages-3/smbumount.8.xml| 78 + docs-xml/smbdotconf/base/configbackend.xml | 26 -- .../smbdotconf/browse/administrative_share.xml | 16 - .../smbdotconf/ldap/clientldapsaslwrapping.xml | 44 --- docs-xml/smbdotconf/logging/debugclass.xml | 18 - docs-xml/smbdotconf/logging/ldapdebuglevel.xml | 28 -- docs-xml/smbdotconf/logging/ldapdebugthreshold.xml | 16 - docs-xml/smbdotconf/misc/registryshares.xml| 24 -- .../smbdotconf/protocol/minreceivefilesize.xml | 22 -- docs-xml/smbdotconf/security/clientlanmanauth.xml |2 +- .../smbdotconf/security/clientplaintextauth.xml|2 +- docs-xml/smbdotconf/security/lanmanauth.xml|2 +- .../smbdotconf/winbind/winbindexpandgroups.xml | 24 -- docs-xml/smbdotconf/winbind/winbindrpconly.xml | 16 - 16 files changed, 543 insertions(+), 237 deletions(-) create mode 100644 docs-xml/manpages-3/smbmnt.8.xml create mode 100644 docs-xml/manpages-3/smbmount.8.xml create mode 100644 docs-xml/manpages-3/smbumount.8.xml delete mode 100644 docs-xml/smbdotconf/base/configbackend.xml delete mode 100644 docs-xml/smbdotconf/browse/administrative_share.xml delete mode 100644 docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml delete mode 100644 docs-xml/smbdotconf/logging/debugclass.xml delete mode 100644 docs-xml/smbdotconf/logging/ldapdebuglevel.xml delete mode 100644 docs-xml/smbdotconf/logging/ldapdebugthreshold.xml delete mode 100644 docs-xml/smbdotconf/misc/registryshares.xml delete mode 100644 docs-xml/smbdotconf/protocol/minreceivefilesize.xml delete mode 100644 docs-xml/smbdotconf/winbind/winbindexpandgroups.xml delete mode 100644 docs-xml/smbdotconf/winbind/winbindrpconly.xml Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/smbmnt.8.xml b/docs-xml/manpages-3/smbmnt.8.xml new file mode 100644 index 000..9425ce7 --- /dev/null +++ b/docs-xml/manpages-3/smbmnt.8.xml @@ -0,0 +1,118 @@ +?xml version=1.0 encoding=iso-8859-1? +!DOCTYPE refentry PUBLIC -//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN http://www.samba.org/samba/DTD/samba-doc; +refentry id=smbmnt.8 + +refmeta + refentrytitlesmbmnt/refentrytitle + manvolnum8/manvolnum +/refmeta + + +refnamediv + refnamesmbmnt/refname + refpurposehelper utility for mounting SMB filesystems/refpurpose +/refnamediv + +refsynopsisdiv + cmdsynopsis + commandsmbmnt/command + arg choice=reqmount-point/arg + arg choice=opt-s lt;sharegt;/arg + arg choice=opt-r/arg + arg choice=opt-u lt;uidgt;/arg + arg choice=opt-g lt;gidgt;/arg + arg choice=opt-f lt;maskgt;/arg + arg choice=opt-d lt;maskgt;/arg + arg choice=opt-o lt;optionsgt;/arg + arg choice=opt-h/arg + /cmdsynopsis +/refsynopsisdiv + +refsect1 + titleDESCRIPTION/title + + paracommandsmbmnt/command is a helper application used + by the smbmount program to do the actual mounting of SMB shares. + commandsmbmnt/command can be installed setuid root if you want + normal users to be able to mount their SMB shares./para + + paraA setuid smbmnt will only allow mounts on directories owned + by the user, and that the user has write permission on./para + + paraThe commandsmbmnt/command program is normally invoked + by citerefentryrefentrytitlesmbmount/refentrytitle + manvolnum8/manvolnum/citerefentry. It should not be invoked directly by users. /para + + parasmbmount searches the normal PATH for smbmnt. You must ensure + that the smbmnt version in your path matches the smbmount used./para + +/refsect1 + +refsect1 + titleOPTIONS/title + + variablelist + varlistentry + term-r/term + listitemparamount the filesystem read-only + /para/listitem + /varlistentry + + varlistentry + term-u uid/term + listitemparaspecify the uid that the files will + be owned by /para/listitem + /varlistentry + +
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2446-g954d099
The branch, v3-3-test has been updated
via 954d0998c2c00140addb6ba3845e80ed91e4effc (commit)
via e305368538eaa72e3008a5517db3708936924297 (commit)
via 255e509474cae92802e90613ccaddb6627ee77cd (commit)
via 0388b2f0cc4d14b005c5b42f2c17ddcbc8bef12a (commit)
from e90a4ce3c24ab2a33e34da5a9052a3b3ec4db962 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 954d0998c2c00140addb6ba3845e80ed91e4effc
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu May 15 17:00:31 2008 +0200
net: Fix net lookup dsgetdcname, no need to pull site ourselves.
Guenther
commit e305368538eaa72e3008a5517db3708936924297
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu May 15 16:59:46 2008 +0200
dsgetdcname: add site support.
Guenther
commit 255e509474cae92802e90613ccaddb6627ee77cd
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu May 15 16:41:18 2008 +0200
dsgetdcname: check for invalid sitename/flag combinations.
Guenther
commit 0388b2f0cc4d14b005c5b42f2c17ddcbc8bef12a
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu May 15 16:38:32 2008 +0200
libads/cldap: store client sitename also keyed by dns domain name.
Guenther
---
Summary of changes:
source/libads/ldap.c|1 +
source/libsmb/dsgetdcname.c | 27 +--
source/utils/net_lookup.c | 14 ++
3 files changed, 24 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index 99fd645..063645f 100644
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -249,6 +249,7 @@ bool ads_try_connect(ADS_STRUCT *ads, const char *server )
/* Store our site name. */
sitename_store( cldap_reply.domain, cldap_reply.client_site);
+ sitename_store( cldap_reply.dns_domain, cldap_reply.client_site);
ret = true;
out:
diff --git a/source/libsmb/dsgetdcname.c b/source/libsmb/dsgetdcname.c
index 1538502..16148a3 100644
--- a/source/libsmb/dsgetdcname.c
+++ b/source/libsmb/dsgetdcname.c
@@ -582,7 +582,8 @@ static NTSTATUS dsgetdcname_cached(TALLOC_CTX *mem_ctx,
/
/
-static bool check_allowed_required_flags(uint32_t flags)
+static bool check_allowed_required_flags(uint32_t flags,
+const char *site_name)
{
uint32_t return_type = flags (DS_RETURN_FLAT_NAME|DS_RETURN_DNS_NAME);
uint32_t offered_type = flags (DS_IS_FLAT_NAME|DS_IS_DNS_NAME);
@@ -593,6 +594,10 @@ static bool check_allowed_required_flags(uint32_t flags)
debug_dsdcinfo_flags(10, flags);
+ if ((flags DS_TRY_NEXTCLOSEST_SITE) site_name) {
+ return false;
+ }
+
if (return_type == (DS_RETURN_FLAT_NAME|DS_RETURN_DNS_NAME)) {
return false;
}
@@ -1385,6 +1390,7 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
{
NTSTATUS status = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
struct netr_DsRGetDCNameInfo *myinfo = NULL;
+ char *query_site = NULL;
DEBUG(10,(dsgetdcname: domain_name: %s,
domain_guid: %s, site_name: %s, flags: 0x%08x\n,
@@ -1394,34 +1400,43 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
*info = NULL;
- if (!check_allowed_required_flags(flags)) {
+ if (!check_allowed_required_flags(flags, site_name)) {
DEBUG(0,(invalid flags specified\n));
return NT_STATUS_INVALID_PARAMETER;
}
+ if (!site_name) {
+ query_site = sitename_fetch(domain_name);
+ } else {
+ query_site = SMB_STRDUP(site_name);
+ }
+
if (flags DS_FORCE_REDISCOVERY) {
goto rediscover;
}
status = dsgetdcname_cached(mem_ctx, msg_ctx, domain_name, domain_guid,
- flags, site_name, myinfo);
+ flags, query_site, myinfo);
if (NT_STATUS_IS_OK(status)) {
*info = myinfo;
- return status;
+ goto done;
}
if (flags DS_BACKGROUND_ONLY) {
- return status;
+ goto done;
}
rediscover:
status = dsgetdcname_rediscover(mem_ctx, msg_ctx, domain_name,
- domain_guid, flags, site_name,
+ domain_guid, flags, query_site,
myinfo);
if (NT_STATUS_IS_OK(status)) {
*info = myinfo;
}
+ done:
+ SAFE_FREE(query_site);
+
return status;
}
diff --git a/source/utils/net_lookup.c
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2452-g5b5b293
The branch, v3-3-test has been updated
via 5b5b29302b53c31256dfa2fdefead458cb14c560 (commit)
via 9ee5ddb96360987675963d629f98051bf34e3031 (commit)
via 5dedde7a5b01d47947a8ff49a57e729fe5bfc817 (commit)
via b7e8a3f1caf54145d750209f2e14b5b54c61769b (commit)
via 889e19303e141e226898f837a637a2d591c75ad9 (commit)
via 340a706422cbca45cc63fa94d36c88f6751f4f31 (commit)
from 954d0998c2c00140addb6ba3845e80ed91e4effc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 5b5b29302b53c31256dfa2fdefead458cb14c560
Author: Michael Adam [EMAIL PROTECTED]
Date: Thu May 15 16:49:25 2008 +0200
net rpc registry: add a getvalueraw subcommand.
Michael
commit 9ee5ddb96360987675963d629f98051bf34e3031
Author: Michael Adam [EMAIL PROTECTED]
Date: Thu May 15 16:07:06 2008 +0200
net rpc registry: abstract add boolean raw to
rpc_registry_getvalue_internal()
and wrap it into new rpc_registry_getvalue_full() for the getvalue
subcommand.
Michael
commit 5dedde7a5b01d47947a8ff49a57e729fe5bfc817
Author: Michael Adam [EMAIL PROTECTED]
Date: Thu May 15 14:38:01 2008 +0200
net rpc registry: fix usage message of getvalue.
Michael
commit b7e8a3f1caf54145d750209f2e14b5b54c61769b
Author: Michael Adam [EMAIL PROTECTED]
Date: Thu May 15 14:35:45 2008 +0200
net registry: add a getvalueraw command to print the value in raw format.
Michael
commit 889e19303e141e226898f837a637a2d591c75ad9
Author: Michael Adam [EMAIL PROTECTED]
Date: Thu May 15 14:34:21 2008 +0200
net registry: refactor core of net_registry_getvalue() out
into net_registry_getvalue_internal(), which takes a bool parameter raw
controlling the output format.
Michael
commit 340a706422cbca45cc63fa94d36c88f6751f4f31
Author: Michael Adam [EMAIL PROTECTED]
Date: Thu May 15 12:55:54 2008 +0200
net_registry: add raw output of value to print_registry_value().
Michael
---
Summary of changes:
source/utils/net_registry.c | 23 +++--
source/utils/net_registry_util.c | 45 +
source/utils/net_registry_util.h |2 +-
source/utils/net_rpc_registry.c | 50 +++--
4 files changed, 102 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/net_registry.c b/source/utils/net_registry.c
index 89eadb5..6b3f6ff 100644
--- a/source/utils/net_registry.c
+++ b/source/utils/net_registry.c
@@ -263,8 +263,8 @@ done:
return ret;
}
-static int net_registry_getvalue(struct net_context *c, int argc,
-const char **argv)
+static int net_registry_getvalue_internal(struct net_context *c, int argc,
+ const char **argv, bool raw)
{
WERROR werr;
int ret = -1;
@@ -291,7 +291,7 @@ static int net_registry_getvalue(struct net_context *c, int
argc,
goto done;
}
- print_registry_value(value);
+ print_registry_value(value, raw);
ret = 0;
@@ -300,6 +300,18 @@ done:
return ret;
}
+static int net_registry_getvalue(struct net_context *c, int argc,
+const char **argv)
+{
+ return net_registry_getvalue_internal(c, argc, argv, false);
+}
+
+static int net_registry_getvalueraw(struct net_context *c, int argc,
+ const char **argv)
+{
+ return net_registry_getvalue_internal(c, argc, argv, true);
+}
+
static int net_registry_setvalue(struct net_context *c, int argc,
const char **argv)
{
@@ -463,6 +475,11 @@ int net_registry(struct net_context *c, int argc, const
char **argv)
Print a registry value,
},
{
+ getvalueraw,
+ net_registry_getvalueraw,
+ Print a registry value (raw format),
+ },
+ {
setvalue,
net_registry_setvalue,
Set a new registry value
diff --git a/source/utils/net_registry_util.c b/source/utils/net_registry_util.c
index ca80e60..2783778 100644
--- a/source/utils/net_registry_util.c
+++ b/source/utils/net_registry_util.c
@@ -32,32 +32,55 @@ void print_registry_key(const char *keyname, NTTIME
*modtime)
d_printf(\n);
}
-void print_registry_value(const struct registry_value *valvalue)
+void print_registry_value(const struct registry_value *valvalue, bool raw)
{
- d_printf(Type = %s\n,
-reg_type_lookup(valvalue-type));
+ if (!raw) {
+ d_printf(Type = %s\n,
+reg_type_lookup(valvalue-type));
+
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2453-gdb933ae
The branch, v3-3-test has been updated via db933ae1a9877b3485506fc8f0ecae2f2bd8a41f (commit) from 5b5b29302b53c31256dfa2fdefead458cb14c560 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit db933ae1a9877b3485506fc8f0ecae2f2bd8a41f Author: Michael Adam [EMAIL PROTECTED] Date: Thu May 15 18:06:23 2008 +0200 net rpc registry: fix getvalueraw to really print raw... Michael --- Summary of changes: source/utils/net_rpc_registry.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/utils/net_rpc_registry.c b/source/utils/net_rpc_registry.c index a23caf5..bc46fbb 100644 --- a/source/utils/net_rpc_registry.c +++ b/source/utils/net_rpc_registry.c @@ -569,7 +569,7 @@ static NTSTATUS rpc_registry_getvalue_internal(struct net_context *c, goto done; } - print_registry_value(value, false); + print_registry_value(value, raw); done: rpccli_winreg_CloseKey(pipe_hnd, tmp_ctx, key_hnd, NULL); -- Samba Shared Repository
[SCM] CTDB repository - branch master updated - 68029894f80804c9f31fc90ed0c1b58f75812c3d
The branch, master has been updated
via 68029894f80804c9f31fc90ed0c1b58f75812c3d (commit)
from 2c292039a0139dcf5bb2bd964eb6f8902d094c50 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 68029894f80804c9f31fc90ed0c1b58f75812c3d
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Fri May 16 08:20:40 2008 +1000
dont disable/enable monitoring for each eventscript, instead
just disable the monitoring during the startrecovery event and enable it
again once recovery has completed
---
Summary of changes:
server/ctdb_monitor.c |2 +-
server/ctdb_recover.c |4
server/ctdb_takeover.c | 11 ---
3 files changed, 1 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/server/ctdb_monitor.c b/server/ctdb_monitor.c
index 05e6643..6526397 100644
--- a/server/ctdb_monitor.c
+++ b/server/ctdb_monitor.c
@@ -161,7 +161,7 @@ void ctdb_disable_monitoring(struct ctdb_context *ctdb)
void ctdb_enable_monitoring(struct ctdb_context *ctdb)
{
ctdb-monitor-monitoring_mode = CTDB_MONITORING_ACTIVE;
- ctdb-monitor-next_interval = 1;
+ ctdb-monitor-next_interval = 2;
DEBUG(DEBUG_INFO,(Monitoring has been enabled\n));
}
diff --git a/server/ctdb_recover.c b/server/ctdb_recover.c
index 3da3b56..8ca3a8f 100644
--- a/server/ctdb_recover.c
+++ b/server/ctdb_recover.c
@@ -815,8 +815,6 @@ static void ctdb_start_recovery_callback(struct
ctdb_context *ctdb, int status,
{
struct recovery_callback_state *state = talloc_get_type(p, struct
recovery_callback_state);
- ctdb_enable_monitoring(ctdb);
-
if (status != 0) {
DEBUG(DEBUG_ERR,(__location__ startrecovery event script
failed (status %d)\n, status));
}
@@ -851,8 +849,6 @@ int32_t ctdb_control_start_recovery(struct ctdb_context
*ctdb,
state, startrecovery);
if (ret != 0) {
- ctdb_enable_monitoring(ctdb);
-
DEBUG(DEBUG_ERR,(__location__ Failed to start recovery\n));
talloc_free(state);
return -1;
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index e3f0a83..517970b 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -126,8 +126,6 @@ static void takeover_ip_callback(struct ctdb_context *ctdb,
int status,
char *ip = inet_ntoa(state-sin-sin_addr);
struct ctdb_tcp_array *tcparray;
- ctdb_enable_monitoring(ctdb);
-
if (status != 0) {
DEBUG(DEBUG_ERR,(__location__ Failed to takeover IP %s on
interface %s\n,
ip, state-vnn-iface));
@@ -233,8 +231,6 @@ int32_t ctdb_control_takeover_ip(struct ctdb_context *ctdb,
inet_ntoa(pip-sin.sin_addr), vnn-public_netmask_bits,
vnn-iface));
- ctdb_disable_monitoring(ctdb);
-
ret = ctdb_event_script_callback(ctdb,
timeval_current_ofs(ctdb-tunable.script_timeout, 0),
state, takeover_ip_callback, state,
@@ -244,7 +240,6 @@ int32_t ctdb_control_takeover_ip(struct ctdb_context *ctdb,
vnn-public_netmask_bits);
if (ret != 0) {
- ctdb_enable_monitoring(ctdb);
DEBUG(DEBUG_ERR,(__location__ Failed to takeover IP %s on
interface %s\n,
inet_ntoa(pip-sin.sin_addr), vnn-iface));
talloc_free(state);
@@ -296,8 +291,6 @@ static void release_ip_callback(struct ctdb_context *ctdb,
int status,
char *ip = inet_ntoa(state-sin-sin_addr);
TDB_DATA data;
- ctdb_enable_monitoring(ctdb);
-
/* send a message to all clients of this node telling them
that the cluster has been reconfigured and they should
release any sockets on this IP */
@@ -361,8 +354,6 @@ int32_t ctdb_control_release_ip(struct ctdb_context *ctdb,
state-vnn = vnn;
- ctdb_disable_monitoring(ctdb);
-
ret = ctdb_event_script_callback(ctdb,
timeval_current_ofs(ctdb-tunable.script_timeout, 0),
state, release_ip_callback, state,
@@ -371,8 +362,6 @@ int32_t ctdb_control_release_ip(struct ctdb_context *ctdb,
inet_ntoa(pip-sin.sin_addr),
vnn-public_netmask_bits);
if (ret != 0) {
- ctdb_enable_monitoring(ctdb);
-
DEBUG(DEBUG_ERR,(__location__ Failed to release IP %s on
interface %s\n,
inet_ntoa(pip-sin.sin_addr), vnn-iface));
talloc_free(state);
--
CTDB repository
[SCM] CTDB repository - branch master updated - 9aa09aee618fa71787c5d0e7c885e83f4d82236c
The branch, master has been updated
via 9aa09aee618fa71787c5d0e7c885e83f4d82236c (commit)
from 68029894f80804c9f31fc90ed0c1b58f75812c3d (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 9aa09aee618fa71787c5d0e7c885e83f4d82236c
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Fri May 16 09:21:44 2008 +1000
add machinereadable output support to ctdb getmonmode
---
Summary of changes:
tools/ctdb.c |8 ++--
1 files changed, 6 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/tools/ctdb.c b/tools/ctdb.c
index 06ebf13..a9839d9 100644
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -1189,8 +1189,12 @@ static int control_getmonmode(struct ctdb_context *ctdb,
int argc, const char **
DEBUG(DEBUG_ERR, (Unable to get monmode from node %u\n,
options.pnn));
return ret;
}
- printf(Monitoring mode:%s
(%d)\n,monmode==CTDB_MONITORING_ACTIVE?ACTIVE:DISABLED,monmode);
-
+ if (!options.machinereadable){
+ printf(Monitoring mode:%s
(%d)\n,monmode==CTDB_MONITORING_ACTIVE?ACTIVE:DISABLED,monmode);
+ } else {
+ printf(:mode:\n);
+ printf(:%d:\n,monmode);
+ }
return 0;
}
--
CTDB repository
Build status as of Fri May 16 00:00:02 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-05-15 00:00:33.0 + +++ /home/build/master/cache/broken_results.txt 2008-05-16 00:00:28.0 + @@ -1,4 +1,4 @@ -Build status as of Thu May 15 00:00:02 2008 +Build status as of Fri May 16 00:00:02 2008 Build counts: Tree Total Broken Panic @@ -6,7 +6,7 @@ ccache 31 8 0 ctdb 0 0 0 distcc 1 0 0 -ldb 31 12 0 +ldb 31 13 0 libreplace 30 12 0 lorikeet-heimdal 27 23 0 pidl 17 13 0 @@ -14,9 +14,9 @@ rsync31 13 0 samba-docs 0 0 0 samba-gtk4 4 0 -samba_3_2_test 31 20 0 +samba_3_2_test 31 21 0 samba_4_0_test 29 23 2 -smb-build29 5 0 +smb-build29 6 0 talloc 31 6 0 tdb 31 13 0
[SCM] CTDB repository - branch master updated - f0b98a32be2043a465d4d0ab42e6c2407d9d60f2
The branch, master has been updated
via f0b98a32be2043a465d4d0ab42e6c2407d9d60f2 (commit)
from 9aa09aee618fa71787c5d0e7c885e83f4d82236c (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit f0b98a32be2043a465d4d0ab42e6c2407d9d60f2
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Fri May 16 09:51:42 2008 +1000
new version .38
---
Summary of changes:
packaging/RPM/ctdb.spec | 15 ++-
1 files changed, 14 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index a62b91a..41fcc59 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -5,7 +5,7 @@ Vendor: Samba Team
Packager: Samba Team [EMAIL PROTECTED]
Name: ctdb
Version: 1.0
-Release: 37
+Release: 38
Epoch: 0
License: GNU GPL version 3
Group: System Environment/Daemons
@@ -120,6 +120,19 @@ fi
%{_includedir}/ctdb_private.h
%changelog
+* Fri May 16 2008 : Version 1.0.38
+ - Add machine readable output support to ctdb getmonmode
+ - Lots of tweaks and enhancements if the event scripts are slow
+ - Merge from tridge: an attempt to break the chicken-and-egg deadlock that
+ net conf introduces if used from an eventscript.
+ - Enhance tickles so we can tickle an ipv6 connection.
+ - Start adding ipv6 support : create a new container to replace sockaddr_in.
+ - Add a checksum routine for ipv6/tcp
+ - When starting up ctdb, let the init script do a tdbdump on all
+ persistent databases and verify that they are good (i.e. not corrupted).
+ - Try to use safe transactions when writing to a persistent database
+ that was opened with the TDB_NOSYNC flag. If we can get the transaction
+ thats great, if we cant we have to write anyway since we cant block here.
* Mon May 12 2008 : Version 1.0.37
- When we shutdown ctdb we close the transport down before we run the
shutdown eventscripts. If ctdb decides to send a packet to a remote node
--
CTDB repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2461-gf888310
The branch, v3-3-test has been updated
via f8883107499ca48db9b0e63718d1d8e384535833 (commit)
via 7de8666c722be5dce8520f34a0823eb8767ab5d5 (commit)
via 9e7466466d216f99582b03431d5c39875c574470 (commit)
via 161e7c32caf5d4fee23e1f9c5e8ea871ad2aa57e (commit)
via 5148e99d0951245632650784d18306db74ed87bd (commit)
via bccf4da9895afc560ac59ac7ee923b4c5d940d09 (commit)
via 95681f066dc070d6552455aabbb27e5487450c5c (commit)
via fec017125ce7b4a3ec87c0fc2ba77c570cf57074 (commit)
from db933ae1a9877b3485506fc8f0ecae2f2bd8a41f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit f8883107499ca48db9b0e63718d1d8e384535833
Author: Michael Adam [EMAIL PROTECTED]
Date: Fri May 16 01:39:12 2008 +0200
packaging: re-introduce Release numbering .ctdb.number
This got accidentially (?) replaced by .ctdb.test.date.
Michael
(cherry picked from commit be62d594bc2b680dfefb4a5050d033b77c08154b)
commit 7de8666c722be5dce8520f34a0823eb8767ab5d5
Author: Michael Adam [EMAIL PROTECTED]
Date: Fri May 16 01:26:47 2008 +0200
packaging: enable calling RHEL-CTDB/makerpms.sh from other directories
Michael
(cherry picked from commit 05168aaa8dba85ecc1b74afacdd4d5ddc5825cfa)
commit 9e7466466d216f99582b03431d5c39875c574470
Author: Michael Adam [EMAIL PROTECTED]
Date: Fri May 16 01:02:56 2008 +0200
packaging: fix RHEL-CTDB build by removing duplicate winbind-32bit
paragraphs
Michael
(cherry picked from commit 29d5a68d95f656d5ca61edc4a10ec8b028597bb5)
commit 161e7c32caf5d4fee23e1f9c5e8ea871ad2aa57e
Author: Michael Adam [EMAIL PROTECTED]
Date: Fri May 16 00:52:46 2008 +0200
packaging: use git-archive in RHEL-CTDB/makerpms.sh
(instead of using tar and make distclean and ...)
Michael
(cherry picked from commit 3ad0f2212720eb5fb33794c033a60f5ea4428c2c)
commit 5148e99d0951245632650784d18306db74ed87bd
Author: Michael Adam [EMAIL PROTECTED]
Date: Fri May 16 00:37:12 2008 +0200
packaging: use docs tarball instead of docs dir in makerpms / samba.spec
Michael
(cherry picked from commit f28a24d5eac2dcf99e1d00c2daf913dd9912eb4a)
commit bccf4da9895afc560ac59ac7ee923b4c5d940d09
Author: Michael Adam [EMAIL PROTECTED]
Date: Fri May 16 00:19:59 2008 +0200
packaging: add a comment explaining EXTRA_OPTIONS to the makerpms script
Michael
(cherry picked from commit 0defc2c60f2ca469d7538c60b7638150c67feb33)
commit 95681f066dc070d6552455aabbb27e5487450c5c
Author: Michael Adam [EMAIL PROTECTED]
Date: Fri May 16 00:15:31 2008 +0200
packaging: fix a comment typo in makerpms script.
Michael
(cherry picked from commit 6044373d69ae8cb0353e7a03e923462a093da5f0)
commit fec017125ce7b4a3ec87c0fc2ba77c570cf57074
Author: Andrew Tridgell [EMAIL PROTECTED]
Date: Fri May 9 21:35:08 2008 +1000
merge build changes from Mathias
(cherry picked from commit 2c08939f3db19eaaf31cb117e3d541d17a36da5e)
---
Summary of changes:
packaging/RHEL-CTDB/makerpms.sh | 73 --
packaging/RHEL-CTDB/samba.spec | 12 ++-
2 files changed, 42 insertions(+), 43 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index 6715194..a9d49bc 100755
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -11,19 +11,20 @@
# /usr/src/redhat directory
#
-# set DOCS_DIR to the path to a release tarball docs dir in order to get docs
+# set DOCS_TARBALL to the path to a docs release tarball in .tar.bz2 format
+
+# extra options passed to rpmbuild
EXTRA_OPTIONS=$1
SPECDIR=`rpm --eval %_specdir`
SRCDIR=`rpm --eval %_sourcedir`
-# At this point the SPECDIR and SRCDIR vaiables must have a value!
+# At this point the SPECDIR and SRCDIR variables must have a value!
-USERID=`id -u`
-GRPID=`id -g`
VERSION='3.2.0'
REVISION='ctdb'
SPECFILE=samba.spec
+DOCS=docs.tar.bz2
RPMVER=`rpm --version | awk '{print $3}'`
RPM=rpmbuild
@@ -40,63 +41,51 @@ case $RPMVER in
;;
esac
-pushd .
-cd ../../source
-if [ -f Makefile ]; then
- make distclean
-fi
-popd
+DIRNAME=$(dirname $0)
-pushd .
-cd ../../
-SRCTREE=`basename $PWD`
-if [ $DOCS_DIR ] [ -d $DOCS_DIR ]; then
-mv docs docs-orig
-ln -s $DOCS_DIR docs
-fi
-cd ../
-chown -R ${USERID}.${GRPID} $SRCTREE
-if [ ! -d samba-${VERSION} ]; then
- ln -s $SRCTREE samba-${VERSION} || exit 1
-fi
+pushd ${DIRNAME}/../..
echo -n Creating samba-${VERSION}.tar.bz2 ...
-tar --exclude=.svn --exclude=.bzr --exclude=.bzrignore --exclude=docs-orig
-chf - samba-${VERSION}/. | bzip2 ${SRCDIR}/samba-${VERSION}.tar.bz2
+git archive --prefix=samba-${VERSION}/ HEAD | bzip2
${SRCDIR}/samba-${VERSION}.tar.bz2
+RC=$?
[SCM] CTDB repository - branch master updated - d32b16a4e5ecc31563c6f2767e7d483f3d980284
The branch, master has been updated
via d32b16a4e5ecc31563c6f2767e7d483f3d980284 (commit)
from f0b98a32be2043a465d4d0ab42e6c2407d9d60f2 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit d32b16a4e5ecc31563c6f2767e7d483f3d980284
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Fri May 16 15:14:17 2008 +1000
When ctdb has just been installed on a node, there wont be any persistent
databases
stored yet.
Fix a cosmetic and annoying warning message when running service ctdb
start and supress printing out that warning your ls command to find the
persistent databases didnt find any ...
---
Summary of changes:
config/ctdb.init |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/ctdb.init b/config/ctdb.init
index 95845d1..88ecc77 100755
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -91,7 +91,8 @@ start() {
[ -z $CTDB_DBDIR ] || {
PERSISTENT_DB_DIR=$CTDB_DBDIR/persistent
}
- for PDBASE in `ls $PERSISTENT_DB_DIR/*.tdb.[0-9]`; do
+ mkdir -p $PERSISTENT_DB_DIR 2/dev/null
+ for PDBASE in `ls $PERSISTENT_DB_DIR/*.tdb.[0-9] 2/dev/null`; do
/usr/bin/tdbdump $PDBASE /dev/null 2/dev/null || {
echo Persistent database $PDBASE is corrupted! CTDB
will not start.
return 1
--
CTDB repository
