[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-197-g06a9678
The branch, master has been updated via 06a9678aad549d23583d860ecd57b221b25f15b6 (commit) from c2295ec65bef4f96991a68048a72b45c228f0509 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 06a9678aad549d23583d860ecd57b221b25f15b6 Author: Björn Jacke b...@sernet.de Date: Wed Jun 10 12:31:07 2009 +0200 s3:pam_smbpass: fix build error on some Linux distros This addresses bug #6459. --- Summary of changes: source3/pam_smbpass/support.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/pam_smbpass/support.c b/source3/pam_smbpass/support.c index 98dda4e..43b9277 100644 --- a/source3/pam_smbpass/support.c +++ b/source3/pam_smbpass/support.c @@ -106,7 +106,7 @@ void _log_err( pam_handle_t *pamh, int err, const char *format, ... ) } strncpy(mod_format, tag, strlen(tag)+1); - strncat(mod_format, format, strlen(format)); + strlcat(mod_format, format, strlen(format)+1); va_start(args, format); vsyslog(err | LOG_AUTH, mod_format, args); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1179-g7c0f1fd
The branch, v3-4-test has been updated via 7c0f1fd01ba355f234f411426b00285c824691b2 (commit) via 250e253f755954ff96c14ed29d6107d344a1c427 (commit) from d08f8595b15144513febe089f2ba0c322dba9ea9 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 7c0f1fd01ba355f234f411426b00285c824691b2 Author: Karolin Seeger ksee...@samba.org Date: Fri Jul 3 09:40:10 2009 +0200 WHATSNEW: Update changes and release date. Karolin commit 250e253f755954ff96c14ed29d6107d344a1c427 Author: Björn Jacke b...@sernet.de Date: Wed Jun 10 12:31:07 2009 +0200 s3:pam_smbpass: fix build error on some Linux distros This addresses bug #6459. (cherry picked from commit 06a9678aad549d23583d860ecd57b221b25f15b6) --- Summary of changes: WHATSNEW.txt |3 ++- source3/pam_smbpass/support.c |2 +- 2 files changed, 3 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 0c6bd76..27f161c 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,6 +1,6 @@ = Release Notes for Samba 3.4.0 - July 1, 2009 + July 3, 2009 = @@ -221,6 +221,7 @@ oGuenther Deschner g...@samba.org oBjoern Jacke b...@sernet.de * BUG 6497: Fix calling of 'test' in configure. + * BUG 6459: Fix build of pam_smbpass on some distributions. oVolker Lendecke v...@samba.org diff --git a/source3/pam_smbpass/support.c b/source3/pam_smbpass/support.c index dabd57d..fa52c6d 100644 --- a/source3/pam_smbpass/support.c +++ b/source3/pam_smbpass/support.c @@ -105,7 +105,7 @@ void _log_err( pam_handle_t *pamh, int err, const char *format, ... ) } strncpy(mod_format, tag, strlen(tag)+1); - strncat(mod_format, format, strlen(format)); + strlcat(mod_format, format, strlen(format)+1); va_start(args, format); vsyslog(err | LOG_AUTH, mod_format, args); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-stable updated - release-3-4-0rc1-23-ge51f114
The branch, v3-4-stable has been updated via e51f114a6efa3d22f21837b55692285b3f83240e (commit) via 069b8a1d8ce017e10505a20a3c46f91c9c2957c6 (commit) from 207ff886784db12b8c779347638a2f6f93199667 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable - Log - commit e51f114a6efa3d22f21837b55692285b3f83240e Author: Karolin Seeger ksee...@samba.org Date: Fri Jul 3 09:40:10 2009 +0200 WHATSNEW: Update changes and release date. Karolin (cherry picked from commit 7c0f1fd01ba355f234f411426b00285c824691b2) commit 069b8a1d8ce017e10505a20a3c46f91c9c2957c6 Author: Björn Jacke b...@sernet.de Date: Wed Jun 10 12:31:07 2009 +0200 s3:pam_smbpass: fix build error on some Linux distros This addresses bug #6459. (cherry picked from commit 06a9678aad549d23583d860ecd57b221b25f15b6) (cherry picked from commit 250e253f755954ff96c14ed29d6107d344a1c427) --- Summary of changes: WHATSNEW.txt |3 ++- source3/pam_smbpass/support.c |2 +- 2 files changed, 3 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 0c6bd76..27f161c 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,6 +1,6 @@ = Release Notes for Samba 3.4.0 - July 1, 2009 + July 3, 2009 = @@ -221,6 +221,7 @@ oGuenther Deschner g...@samba.org oBjoern Jacke b...@sernet.de * BUG 6497: Fix calling of 'test' in configure. + * BUG 6459: Fix build of pam_smbpass on some distributions. oVolker Lendecke v...@samba.org diff --git a/source3/pam_smbpass/support.c b/source3/pam_smbpass/support.c index dabd57d..fa52c6d 100644 --- a/source3/pam_smbpass/support.c +++ b/source3/pam_smbpass/support.c @@ -105,7 +105,7 @@ void _log_err( pam_handle_t *pamh, int err, const char *format, ... ) } strncpy(mod_format, tag, strlen(tag)+1); - strncat(mod_format, format, strlen(format)); + strlcat(mod_format, format, strlen(format)+1); va_start(args, format); vsyslog(err | LOG_AUTH, mod_format, args); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1181-gebe56e6
The branch, v3-4-test has been updated
via ebe56e6872228fcbd81ead598eb2c5b1738b7f4c (commit)
via 8446843ec43cd61e548dda7032f26020240d872d (commit)
from 7c0f1fd01ba355f234f411426b00285c824691b2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit ebe56e6872228fcbd81ead598eb2c5b1738b7f4c
Author: Karolin Seeger ksee...@samba.org
Date: Fri Jul 3 09:47:32 2009 +0200
WHATSNEW: Update changes.
Karolin
commit 8446843ec43cd61e548dda7032f26020240d872d
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jun 30 16:03:11 2009 +0200
s3:util: let parent_dirname() correctly return toplevel filenames
metze
(cherry picked from commit a14efbadd53ac9678d75e6029f947d63cfa0c4e5)
Signed-off-by: Stefan Metzmacher me...@samba.org
This addresses bug #6526.
---
Summary of changes:
WHATSNEW.txt |4
source3/lib/util.c |2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 27f161c..68c8b9e 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -237,6 +237,10 @@ oJim McDonough j...@samba.org
not.
+oStefan Metzmacher me...@samba.org
+ * BUG 6526: Fix notifies in the share root directory.
+
+
oBo Yang boy...@samba.org
* BUG 6499: Fix building of pam_smbpass.
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 822b0cf..61a73e6 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -2336,7 +2336,7 @@ bool parent_dirname(TALLOC_CTX *mem_ctx, const char *dir,
char **parent,
return False;
}
if (name) {
- *name = ;
+ *name = dir;
}
return True;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-stable updated - release-3-4-0rc1-25-g92bc5b1
The branch, v3-4-stable has been updated
via 92bc5b1f8d3bd5629cd733875eeaabd5561585fb (commit)
via 91472d08a7d01d223ef4b7a274a07f6aa6579337 (commit)
from e51f114a6efa3d22f21837b55692285b3f83240e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable
- Log -
commit 92bc5b1f8d3bd5629cd733875eeaabd5561585fb
Author: Karolin Seeger ksee...@samba.org
Date: Fri Jul 3 09:47:32 2009 +0200
WHATSNEW: Update changes.
Karolin
(cherry picked from commit ebe56e6872228fcbd81ead598eb2c5b1738b7f4c)
commit 91472d08a7d01d223ef4b7a274a07f6aa6579337
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jun 30 16:03:11 2009 +0200
s3:util: let parent_dirname() correctly return toplevel filenames
metze
(cherry picked from commit a14efbadd53ac9678d75e6029f947d63cfa0c4e5)
Signed-off-by: Stefan Metzmacher me...@samba.org
This addresses bug #6526.
(cherry picked from commit 8446843ec43cd61e548dda7032f26020240d872d)
---
Summary of changes:
WHATSNEW.txt |4
source3/lib/util.c |2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 27f161c..68c8b9e 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -237,6 +237,10 @@ oJim McDonough j...@samba.org
not.
+oStefan Metzmacher me...@samba.org
+ * BUG 6526: Fix notifies in the share root directory.
+
+
oBo Yang boy...@samba.org
* BUG 6499: Fix building of pam_smbpass.
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 822b0cf..61a73e6 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -2336,7 +2336,7 @@ bool parent_dirname(TALLOC_CTX *mem_ctx, const char *dir,
char **parent,
return False;
}
if (name) {
- *name = ;
+ *name = dir;
}
return True;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5329-g58f4493
The branch, v3-3-test has been updated
via 58f449318dd07240c60513559cf682aa243d3e4c (commit)
from 5b03af33ad45368bea7cf6cabc91f62e2503de99 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 58f449318dd07240c60513559cf682aa243d3e4c
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jun 30 16:03:11 2009 +0200
s3:util: let parent_dirname() correctly return toplevel filenames
metze
(cherry picked from commit a14efbadd53ac9678d75e6029f947d63cfa0c4e5)
Signed-off-by: Stefan Metzmacher me...@samba.org
This addresses bug #6526.
---
Summary of changes:
source/lib/util.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/util.c b/source/lib/util.c
index 0ea7bf6..9a990d4 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -2685,7 +2685,7 @@ bool parent_dirname_talloc(TALLOC_CTX *mem_ctx, const
char *dir,
return False;
}
if (name) {
- *name = ;
+ *name = dir;
}
return True;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3637-g92bb02a
The branch, v3-2-test has been updated
via 92bb02adbc808ed3180ab66b45fb717c9dad03b4 (commit)
from 00aaf9a46a202d7cd0a8cd3b8e2f9d95238a761a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 92bb02adbc808ed3180ab66b45fb717c9dad03b4
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jun 30 16:03:11 2009 +0200
s3:util: let parent_dirname() correctly return toplevel filenames
metze
(cherry picked from commit a14efbadd53ac9678d75e6029f947d63cfa0c4e5)
Signed-off-by: Stefan Metzmacher me...@samba.org
This addresses bug #6526.
---
Summary of changes:
source/lib/util.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/util.c b/source/lib/util.c
index 002c14a..e3a346b 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -2669,7 +2669,7 @@ bool parent_dirname_talloc(TALLOC_CTX *mem_ctx, const
char *dir,
return False;
}
if (name) {
- *name = ;
+ *name = dir;
}
return True;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1182-gf0d67b6
The branch, v3-4-test has been updated via f0d67b6e119d719c2540eadce5849d3200dea2d0 (commit) from ebe56e6872228fcbd81ead598eb2c5b1738b7f4c (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit f0d67b6e119d719c2540eadce5849d3200dea2d0 Author: Volker Lendecke v...@samba.org Date: Tue Jun 30 11:42:15 2009 -0700 Fix bug #6431 - local groups from 3.0 setups no longer found. Search for groups without group suffix, group suffix is only used for new entries. (cherry picked from commit 91a8cb851e1919a337310e2c699d8fcf76a55060) --- Summary of changes: source3/passdb/pdb_ldap.c | 16 1 files changed, 8 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 5cbe675..0886a10 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -2297,7 +2297,7 @@ static int ldapsam_search_one_group (struct ldapsam_privates *ldap_state, attr_list = get_attr_list(NULL, groupmap_attr_list); rc = smbldap_search(ldap_state-smbldap_state, - lp_ldap_group_suffix (), scope, + lp_ldap_suffix (), scope, filter, attr_list, 0, result); TALLOC_FREE(attr_list); @@ -2617,7 +2617,7 @@ static NTSTATUS ldapsam_enum_group_members(struct pdb_methods *methods, goto done; } - rc = smbldap_search(conn, lp_ldap_group_suffix(), + rc = smbldap_search(conn, lp_ldap_suffix(), LDAP_SCOPE_SUBTREE, filter, id_attrs, 0, result); @@ -2865,7 +2865,7 @@ static NTSTATUS ldapsam_enum_group_memberships(struct pdb_methods *methods, goto done; } - rc = smbldap_search(conn, lp_ldap_group_suffix(), + rc = smbldap_search(conn, lp_ldap_suffix(), LDAP_SCOPE_SUBTREE, filter, attrs, 0, result); if (rc != LDAP_SUCCESS) @@ -3323,7 +3323,7 @@ static NTSTATUS ldapsam_setsamgrent(struct pdb_methods *my_methods, return NT_STATUS_NO_MEMORY; } attr_list = get_attr_list( NULL, groupmap_attr_list ); - rc = smbldap_search(ldap_state-smbldap_state, lp_ldap_group_suffix(), + rc = smbldap_search(ldap_state-smbldap_state, lp_ldap_suffix(), LDAP_SCOPE_SUBTREE, filter, attr_list, 0, ldap_state-result); TALLOC_FREE(attr_list); @@ -3332,7 +3332,7 @@ static NTSTATUS ldapsam_setsamgrent(struct pdb_methods *my_methods, DEBUG(0, (ldapsam_setsamgrent: LDAP search failed: %s\n, ldap_err2string(rc))); DEBUG(3, (ldapsam_setsamgrent: Query was: %s, %s\n, - lp_ldap_group_suffix(), filter)); + lp_ldap_suffix(), filter)); ldap_msgfree(ldap_state-result); ldap_state-result = NULL; TALLOC_FREE(filter); @@ -3722,7 +3722,7 @@ static NTSTATUS ldapsam_alias_memberships(struct pdb_methods *methods, return NT_STATUS_NO_MEMORY; } - rc = smbldap_search(ldap_state-smbldap_state, lp_ldap_group_suffix(), + rc = smbldap_search(ldap_state-smbldap_state, lp_ldap_suffix(), LDAP_SCOPE_SUBTREE, filter, attrs, 0, result); if (rc != LDAP_SUCCESS) @@ -4078,7 +4078,7 @@ static NTSTATUS ldapsam_lookup_rids(struct pdb_methods *methods, } rc = smbldap_search(ldap_state-smbldap_state, - lp_ldap_group_suffix(), + lp_ldap_suffix(), LDAP_SCOPE_SUBTREE, filter, ldap_attrs, 0, msg); talloc_autofree_ldapmsg(mem_ctx, msg); @@ -4680,7 +4680,7 @@ static bool ldapsam_search_grouptype(struct pdb_methods *methods, state-connection = ldap_state-smbldap_state; - state-base = talloc_strdup(search, lp_ldap_group_suffix()); + state-base = talloc_strdup(search, lp_ldap_suffix()); state-connection = ldap_state-smbldap_state; state-scope = LDAP_SCOPE_SUBTREE; state-filter = talloc_asprintf(search, ((objectclass=%s) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-198-g0b06aa2
The branch, master has been updated via 0b06aa23049f49b985432c6b18c8a888a079eca1 (commit) from 06a9678aad549d23583d860ecd57b221b25f15b6 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 0b06aa23049f49b985432c6b18c8a888a079eca1 Author: Matt Kraai mkr...@beckman.com Date: Wed Jul 1 12:44:03 2009 -0700 s3:configure: define _LARGEFILE64_SOURCE on QNX --- Summary of changes: source3/configure.in |4 1 files changed, 4 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/configure.in b/source3/configure.in index a1388fd..09db1ed 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -622,6 +622,10 @@ exit(1); fi AC_MSG_RESULT([$GLIBC_LFS_SUPPORT]) ;; +*qnx*) +CPPFLAGS=-D_LARGEFILE64_SOURCE $CPPFLAGS +AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support]) +;; esac -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-199-gdcf03b9
The branch, master has been updated via dcf03b9d431bf5733bde76143da7405650ba119a (commit) from 0b06aa23049f49b985432c6b18c8a888a079eca1 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit dcf03b9d431bf5733bde76143da7405650ba119a Author: Matt Kraai mkr...@beckman.com Date: Wed Jul 1 10:49:35 2009 -0700 do not redefine _INT32 --- Summary of changes: source3/include/includes.h |6 -- source3/libaddns/dns.h |6 -- 2 files changed, 8 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/includes.h b/source3/include/includes.h index c1aeaf9..2b36d18 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -313,8 +313,10 @@ typedef sig_atomic_t volatile SIG_ATOMIC_T; #if !defined(int32) !defined(HAVE_INT32_FROM_RPC_RPC_H) # define int32 int32_t - /* needed to work around compile issue on HP-UX 11.x */ -# define _INT32 1 +# ifndef _INT32 + /* needed to work around compile issue on HP-UX 11.x */ +#define _INT32 1 +# endif #endif /* diff --git a/source3/libaddns/dns.h b/source3/libaddns/dns.h index a04a13b..72cba07 100644 --- a/source3/libaddns/dns.h +++ b/source3/libaddns/dns.h @@ -180,8 +180,10 @@ void *talloc_zeronull(const void *context, size_t size, const char *name); /* uggh - no 32 bit type?? probably a CRAY. just hope this works ... */ #define int32 int # endif - /* needed to work around compile issue on HP-UX 11.x */ -# define _INT321 +# ifndef _INT32 + /* needed to work around compile issue on HP-UX 11.x */ +#define _INT321 +# endif #endif /* -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-200-g914fa62
The branch, master has been updated
via 914fa629f24c7ae7b99670c66427ee733bf53f8d (commit)
from dcf03b9d431bf5733bde76143da7405650ba119a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 914fa629f24c7ae7b99670c66427ee733bf53f8d
Author: Michael Adam ob...@samba.org
Date: Fri Jul 3 11:35:11 2009 +0200
Revert [s3]pidfile_create: use check is_default_dyn_CONFIGFILE() since we
have it.
This reverts commit 1d3dcd1e420104c23769b691d0b8b7958d5c58a7.
This fixes Bug #6531 (Pid File creation.)
Usually, I would extend is_default_dyn_XYZ() so that it returns true
when dyn_XYZ has not been set yet or when its value is equal to the
compiled in default value XZY. But this would have a change in effect
in popt_common and torture.c: is_default_dyn_CONFIGFILE() is used
there to check whether the config file should be overwritten by the
contents of the environment variable SMB_CONF_PATH. Currently this
is only done when set_dyn_CONFIGFILE() had _not_ previously been called
at all, not even with the same value as the compiled in default.
Michael
---
Summary of changes:
source3/lib/pidfile.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/pidfile.c b/source3/lib/pidfile.c
index 37b36af..2c52d12 100644
--- a/source3/lib/pidfile.c
+++ b/source3/lib/pidfile.c
@@ -94,7 +94,7 @@ void pidfile_create(const char *program_name)
/* Add a suffix to the program name if this is a process with a
* none default configuration file name. */
- if (is_default_dyn_CONFIGFILE()) {
+ if (strcmp( CONFIGFILE, get_dyn_CONFIGFILE()) == 0) {
name = SMB_STRDUP(program_name);
} else {
short_configfile = strrchr( get_dyn_CONFIGFILE(), '/');
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1184-g4735bf0
The branch, v3-4-test has been updated
via 4735bf0e744e1015eeb5a9ef6e744011183d9e30 (commit)
via 0943d8f6b2389b3763bad24bcfdb61b0508c (commit)
from f0d67b6e119d719c2540eadce5849d3200dea2d0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 4735bf0e744e1015eeb5a9ef6e744011183d9e30
Author: Karolin Seeger ksee...@samba.org
Date: Fri Jul 3 13:08:06 2009 +0200
WHATSNEW: Update changes.
Karolin
commit 0943d8f6b2389b3763bad24bcfdb61b0508c
Author: Michael Adam ob...@samba.org
Date: Fri Jul 3 11:35:11 2009 +0200
Revert [s3]pidfile_create: use check is_default_dyn_CONFIGFILE() since we
have it.
This reverts commit 1d3dcd1e420104c23769b691d0b8b7958d5c58a7.
This fixes Bug #6531 (Pid File creation.)
Usually, I would extend is_default_dyn_XYZ() so that it returns true
when dyn_XYZ has not been set yet or when its value is equal to the
compiled in default value XZY. But this would have a change in effect
in popt_common and torture.c: is_default_dyn_CONFIGFILE() is used
there to check whether the config file should be overwritten by the
contents of the environment variable SMB_CONF_PATH. Currently this
is only done when set_dyn_CONFIGFILE() had _not_ previously been called
at all, not even with the same value as the compiled in default.
Michael
(cherry picked from commit 914a14b3a9c9d922d2a5c1aa413945afa11cfd2a)
Signed-off-by: Michael Adam ob...@samba.org
---
Summary of changes:
WHATSNEW.txt |2 ++
source3/lib/pidfile.c |2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 68c8b9e..9d45601 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -213,6 +213,7 @@ oJeremy Allison j...@samba.org
oMichael Adam ob...@samba.org
* BUG 6509: Use gid (not uid) cache in fetch_gid_from_cache().
* BUG 6521: Fix building tevent_ntstatus without config.h.
+ * BUG 6531: Fix pid file name.
oGuenther Deschner g...@samba.org
@@ -225,6 +226,7 @@ oBjoern Jacke b...@sernet.de
oVolker Lendecke v...@samba.org
+ * BUG 6431: Local groups from 3.0 setups no longer found.
* BUG 6498: Add workaround for MS KB932762.
diff --git a/source3/lib/pidfile.c b/source3/lib/pidfile.c
index 37b36af..2c52d12 100644
--- a/source3/lib/pidfile.c
+++ b/source3/lib/pidfile.c
@@ -94,7 +94,7 @@ void pidfile_create(const char *program_name)
/* Add a suffix to the program name if this is a process with a
* none default configuration file name. */
- if (is_default_dyn_CONFIGFILE()) {
+ if (strcmp( CONFIGFILE, get_dyn_CONFIGFILE()) == 0) {
name = SMB_STRDUP(program_name);
} else {
short_configfile = strrchr( get_dyn_CONFIGFILE(), '/');
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-stable updated - release-3-4-0rc1-28-g51b334e
The branch, v3-4-stable has been updated
via 51b334e2d9739abc748490f6085ed8b8e5e1f4b4 (commit)
via 7907d399ed0110072ff39ed1f8edccbbad531bfd (commit)
via 385df2910af4f4369b34fb2ccddbe64af6e2c0a5 (commit)
from 92bc5b1f8d3bd5629cd733875eeaabd5561585fb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable
- Log -
commit 51b334e2d9739abc748490f6085ed8b8e5e1f4b4
Author: Volker Lendecke v...@samba.org
Date: Tue Jun 30 11:42:15 2009 -0700
Fix bug #6431 - local groups from 3.0 setups no longer found.
Search for groups without group suffix, group suffix is only used for new
entries.
(cherry picked from commit 91a8cb851e1919a337310e2c699d8fcf76a55060)
(cherry picked from commit f0d67b6e119d719c2540eadce5849d3200dea2d0)
commit 7907d399ed0110072ff39ed1f8edccbbad531bfd
Author: Karolin Seeger ksee...@samba.org
Date: Fri Jul 3 13:08:06 2009 +0200
WHATSNEW: Update changes.
Karolin
(cherry picked from commit 4735bf0e744e1015eeb5a9ef6e744011183d9e30)
commit 385df2910af4f4369b34fb2ccddbe64af6e2c0a5
Author: Michael Adam ob...@samba.org
Date: Fri Jul 3 11:35:11 2009 +0200
Revert [s3]pidfile_create: use check is_default_dyn_CONFIGFILE() since we
have it.
This reverts commit 1d3dcd1e420104c23769b691d0b8b7958d5c58a7.
This fixes Bug #6531 (Pid File creation.)
Usually, I would extend is_default_dyn_XYZ() so that it returns true
when dyn_XYZ has not been set yet or when its value is equal to the
compiled in default value XZY. But this would have a change in effect
in popt_common and torture.c: is_default_dyn_CONFIGFILE() is used
there to check whether the config file should be overwritten by the
contents of the environment variable SMB_CONF_PATH. Currently this
is only done when set_dyn_CONFIGFILE() had _not_ previously been called
at all, not even with the same value as the compiled in default.
Michael
(cherry picked from commit 914a14b3a9c9d922d2a5c1aa413945afa11cfd2a)
Signed-off-by: Michael Adam ob...@samba.org
(cherry picked from commit 0943d8f6b2389b3763bad24bcfdb61b0508c)
---
Summary of changes:
WHATSNEW.txt |2 ++
source3/lib/pidfile.c |2 +-
source3/passdb/pdb_ldap.c | 16
3 files changed, 11 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 68c8b9e..9d45601 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -213,6 +213,7 @@ oJeremy Allison j...@samba.org
oMichael Adam ob...@samba.org
* BUG 6509: Use gid (not uid) cache in fetch_gid_from_cache().
* BUG 6521: Fix building tevent_ntstatus without config.h.
+ * BUG 6531: Fix pid file name.
oGuenther Deschner g...@samba.org
@@ -225,6 +226,7 @@ oBjoern Jacke b...@sernet.de
oVolker Lendecke v...@samba.org
+ * BUG 6431: Local groups from 3.0 setups no longer found.
* BUG 6498: Add workaround for MS KB932762.
diff --git a/source3/lib/pidfile.c b/source3/lib/pidfile.c
index 37b36af..2c52d12 100644
--- a/source3/lib/pidfile.c
+++ b/source3/lib/pidfile.c
@@ -94,7 +94,7 @@ void pidfile_create(const char *program_name)
/* Add a suffix to the program name if this is a process with a
* none default configuration file name. */
- if (is_default_dyn_CONFIGFILE()) {
+ if (strcmp( CONFIGFILE, get_dyn_CONFIGFILE()) == 0) {
name = SMB_STRDUP(program_name);
} else {
short_configfile = strrchr( get_dyn_CONFIGFILE(), '/');
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 5cbe675..0886a10 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -2297,7 +2297,7 @@ static int ldapsam_search_one_group (struct
ldapsam_privates *ldap_state,
attr_list = get_attr_list(NULL, groupmap_attr_list);
rc = smbldap_search(ldap_state-smbldap_state,
- lp_ldap_group_suffix (), scope,
+ lp_ldap_suffix (), scope,
filter, attr_list, 0, result);
TALLOC_FREE(attr_list);
@@ -2617,7 +2617,7 @@ static NTSTATUS ldapsam_enum_group_members(struct
pdb_methods *methods,
goto done;
}
- rc = smbldap_search(conn, lp_ldap_group_suffix(),
+ rc = smbldap_search(conn, lp_ldap_suffix(),
LDAP_SCOPE_SUBTREE, filter, id_attrs, 0,
result);
@@ -2865,7 +2865,7 @@ static NTSTATUS ldapsam_enum_group_memberships(struct
pdb_methods *methods,
goto done;
}
- rc = smbldap_search(conn, lp_ldap_group_suffix(),
+ rc = smbldap_search(conn, lp_ldap_suffix(),
LDAP_SCOPE_SUBTREE, filter, attrs, 0,
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-201-gfa453d9
The branch, master has been updated via fa453d944d0038e39004da13963430bd312b5804 (commit) from 914fa629f24c7ae7b99670c66427ee733bf53f8d (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit fa453d944d0038e39004da13963430bd312b5804 Author: Jelmer Vernooij jel...@samba.org Date: Fri Jul 3 02:59:40 2009 +0200 s4: Don't install epdump, since it no longer exists. --- Summary of changes: source4/Makefile |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/Makefile b/source4/Makefile index 62fb9d4..d6ce517 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -115,8 +115,7 @@ INSTALL_SCRIPTS = $(addprefix scripting/bin/, \ autoidl \ samba3dump \ rpcclient \ - smbstatus \ - epdump) + smbstatus) $(foreach SCRIPT,$(INSTALL_SCRIPTS),$(eval $(call binary_install_template,$(SCRIPT -- Samba Shared Repository
[SCM] Samba Shared Repository - annotated tag release-3-4-0 created - release-3-4-0
The annotated tag, release-3-4-0 has been created at e76ec00b806ba5b2d83e716672a7c0ae2733f548 (tag) tagging 51b334e2d9739abc748490f6085ed8b8e5e1f4b4 (commit) replaces release-3-4-0rc1 tagged by Karolin Seeger on Fri Jul 3 13:55:51 2009 +0200 - Log - tag release-3-4-0 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iD8DBQBKTfHNbzORW2Vot+oRAjOQAKC9FiiffKsPqJkGjhHTD/3h7u2sxgCfQm2s UFgkGlF+UPZD/CQKpUg4EMo= =m9Ga -END PGP SIGNATURE- Björn Jacke (2): s3:configure: test only takes one = s3:pam_smbpass: fix build error on some Linux distros Bo Yang (1): s3: fix building of pam_smbpass. David Markey (1): Fix bug 6514: net gives unhelpful lp_load failed when it's missing smb.conf Günther Deschner (2): s3-selftest: add RPC-SAMR-MACHINE-AUTH to list of test to run against s3. s3-spoolss: Bug #6512. Fix support for enumerating user forms. Jeremy Allison (1): Fix bug #6520 time stamps - e.g. last mod time is not preserved when unix extensions=yes are set - and using latest cifs vfs client Jim McDonough (1): Don't require Modify property perms to unjoin bug #6481) net ads leave stopped working when modify properties permissions were not granted (meaning you had to be allowed to disable the account that you were about to delete). Karolin Seeger (11): s3/docs: Fix typo. WHATSNEW: Update changes since 3.4.0rc1. s3/VERSION: Raise version number up to 3.4.0. WHATSNEW: Update changes. WHATSNEW: Update changes. WHATSNEW: Update changes since 3.4.0rc1. WHATSNEW: Update changes since 3.4.0rc1. WHATSNEW: Update changes since 3.4.0rc1. WHATSNEW: Update changes and release date. WHATSNEW: Update changes. WHATSNEW: Update changes. Matt Kraai (1): s3/docs: Fix typo. Michael Adam (4): s3:passdb: fix bug #6509: use gid (not uid) cache in fetch_gid_from_cache(). lib/util: fix building tevent_ntstatus without config.h lib/util: fix order of includes in tevent_ntstatus.c Revert [s3]pidfile_create: use check is_default_dyn_CONFIGFILE() since we have it. Stefan Metzmacher (1): s3:util: let parent_dirname() correctly return toplevel filenames Tim Prouty (1): s3 docs: Add documentation for 'kerberos method' and 'dedicated keytab file' parameters Volker Lendecke (2): s3/lanman: Workaround for KB932762. Fix bug #6431 - local groups from 3.0 setups no longer found. --- -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-202-gb54e48b
The branch, master has been updated via b54e48b830dbc3d66f9de5d2711a57a1630809e2 (commit) from fa453d944d0038e39004da13963430bd312b5804 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit b54e48b830dbc3d66f9de5d2711a57a1630809e2 Author: Björn Jacke b...@sernet.de Date: Fri Jul 3 14:25:06 2009 +0200 s3:configure: fix syntax error in avahi configure test --- Summary of changes: source3/configure.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/configure.in b/source3/configure.in index 09db1ed..7115a3b 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -6162,7 +6162,7 @@ if test x$enable_avahi != xno; then LIBS=$save_LIBS if test x$ac_cv_lib_ext_avahi_client_avahi_client_new != xyes -o \ - test x$ac_cv_lib_ext_avahi_common_avahi_strerror != xyes ; then + x$ac_cv_lib_ext_avahi_common_avahi_strerror != xyes ; then have_avahi_support=no fi -- Samba Shared Repository
svn commit: samba-web r1309 - in trunk: . devel history
Author: kseeger Date: 2009-07-03 12:55:45 + (Fri, 03 Jul 2009) New Revision: 1309 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1309 Log: Announce Samba 3.4.0 Karolin Added: trunk/history/samba-3.4.0.html Modified: trunk/devel/index.html trunk/header_columns.html trunk/history/header_history.html trunk/index.html Changeset: Sorry, the patch is too large (607 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1309
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-205-g7119241
The branch, master has been updated
via 7119241c0d12768b31ebdb489aa0bbba6ca21e40 (commit)
via 30b2014a01b31d66dd76e0562c5d769dfacf167b (commit)
via 2738178d1301f9c1c4144c7472c9419911cd816e (commit)
from b54e48b830dbc3d66f9de5d2711a57a1630809e2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7119241c0d12768b31ebdb489aa0bbba6ca21e40
Author: Simo Sorce i...@samba.org
Date: Fri Jul 3 08:42:23 2009 -0400
Sort the signature files
commit 30b2014a01b31d66dd76e0562c5d769dfacf167b
Author: Simo Sorce i...@samba.org
Date: Thu Jun 18 20:06:00 2009 -0400
Expose functions need by backend writers
move publicly needed structures and functions in the public header.
Stop installing internal headers.
Update the signature and exports files with the new exposed
function.
commit 2738178d1301f9c1c4144c7472c9419911cd816e
Author: Simo Sorce i...@samba.org
Date: Thu Jul 2 09:29:20 2009 -0400
Restore ABI compatibility for talloc.
---
Summary of changes:
lib/talloc/abi_checks.sh |6 ++-
lib/talloc/configure.ac |2 +-
lib/talloc/talloc.c | 43 +--
lib/talloc/talloc.exports|6 ++-
lib/talloc/talloc.h | 14 ---
lib/talloc/talloc.signatures | 95 +
lib/tdb/abi_checks.sh|2 +-
lib/tdb/tdb.signatures | 86 +++---
lib/tevent/abi_checks.sh |4 +-
lib/tevent/tevent.exports|1 +
lib/tevent/tevent.h | 64
lib/tevent/tevent.mk |1 -
lib/tevent/tevent.signatures | 85 +++--
lib/tevent/tevent_internal.h | 50 --
source3/configure.in |2 +-
source4/min_versions.m4 |2 +-
16 files changed, 262 insertions(+), 201 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/abi_checks.sh b/lib/talloc/abi_checks.sh
index 432cc87..e3d3b04 100755
--- a/lib/talloc/abi_checks.sh
+++ b/lib/talloc/abi_checks.sh
@@ -4,15 +4,17 @@ make clean
mkdir abi
ABI_CHECKS=-aux-info abi/\...@.x
-make ABI_CHECK=$ABI_CHECKS
+make ABI_CHECK=$ABI_CHECKS CC=/usr/bin/gcc
-for i in abi/*.X; do cat $i | grep 'talloc\.h'; done | sort | uniq | awk -F
extern '{ print $2 }' abi/signatures
+for i in abi/*.X; do cat $i | grep 'talloc\.h'; done | sort | uniq | awk -F
extern '{ print $2 }' | sort abi/signatures
cat abi/exports EOF
{
global:
EOF
cat abi/signatures | awk -F '(' '{ print $1 }' | awk -F ' ' '{ print
$NF; }' | tr -d '*' | sort abi/exports
+# need to manually add talloc free for backward ABI compat
+echo ' talloc_free;' abi/exports
cat abi/exports EOF
local: *;
diff --git a/lib/talloc/configure.ac b/lib/talloc/configure.ac
index d6471a4..161f6f7 100644
--- a/lib/talloc/configure.ac
+++ b/lib/talloc/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.50)
-AC_INIT(talloc, 2.0.0)
+AC_INIT(talloc, 1.4.0)
AC_CONFIG_SRCDIR([talloc.c])
AC_SUBST(datarootdir)
AC_CONFIG_HEADER(config.h)
diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c
index a23df38..8ccebe2 100644
--- a/lib/talloc/talloc.c
+++ b/lib/talloc/talloc.c
@@ -477,7 +477,7 @@ static inline void *_talloc_named_const(const void
*context, size_t size, const
same underlying data, and you want to be able to free the two instances
separately,
and in either order
*/
-void *_talloc_reference(const void *context, const void *ptr, const char
*location)
+void *_talloc_reference_loc(const void *context, const void *ptr, const char
*location)
{
struct talloc_chunk *tc;
struct talloc_reference_handle *handle;
@@ -499,6 +499,7 @@ void *_talloc_reference(const void *context, const void
*ptr, const char *locati
return handle-ptr;
}
+static void *_talloc_steal_internal(const void *new_ctx, const void *ptr);
/*
internal talloc_free call
@@ -613,7 +614,7 @@ static inline int _talloc_free_internal(void *ptr)
ptr on success, or NULL if it could not be transferred.
passing NULL as ptr will always return NULL with no side effects.
*/
-void *_talloc_steal_internal(const void *new_ctx, const void *ptr)
+static void *_talloc_steal_internal(const void *new_ctx, const void *ptr)
{
struct talloc_chunk *tc, *new_tc;
@@ -665,13 +666,12 @@ void *_talloc_steal_internal(const void *new_ctx, const
void *ptr)
return discard_const_p(void, ptr);
}
-
/*
move a lump of memory from one talloc context to another return the
ptr on success, or NULL if it could not be transferred.
passing NULL as ptr will always return NULL with no side effects.
*/
-void *_talloc_steal(const void *new_ctx, const void *ptr, const char *location)
+void *_talloc_steal_loc(const void
Re: [SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-205-g7119241
On Fri, Jul 03, 2009 at 08:26:53AM -0500, Simo Sorce wrote: The branch, master has been updated via 7119241c0d12768b31ebdb489aa0bbba6ca21e40 (commit) via 30b2014a01b31d66dd76e0562c5d769dfacf167b (commit) via 2738178d1301f9c1c4144c7472c9419911cd816e (commit) from b54e48b830dbc3d66f9de5d2711a57a1630809e2 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 7119241c0d12768b31ebdb489aa0bbba6ca21e40 Author: Simo Sorce i...@samba.org Date: Fri Jul 3 08:42:23 2009 -0400 Sort the signature files commit 30b2014a01b31d66dd76e0562c5d769dfacf167b Author: Simo Sorce i...@samba.org Date: Thu Jun 18 20:06:00 2009 -0400 Expose functions need by backend writers move publicly needed structures and functions in the public header. Stop installing internal headers. Update the signature and exports files with the new exposed function. commit 2738178d1301f9c1c4144c7472c9419911cd816e Author: Simo Sorce i...@samba.org Date: Thu Jul 2 09:29:20 2009 -0400 Restore ABI compatibility for talloc. Thanks a *lot*! Volker signature.asc Description: Digital signature
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-206-gcdf025f
The branch, master has been updated via cdf025f012d6a426396da5478735663468023bd4 (commit) from 7119241c0d12768b31ebdb489aa0bbba6ca21e40 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit cdf025f012d6a426396da5478735663468023bd4 Author: Björn Jacke b...@sernet.de Date: Fri Jul 3 18:22:16 2009 +0200 tdb: fix define of tdbdir when srcdir != . --- Summary of changes: lib/tdb/libtdb.m4 |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/tdb/libtdb.m4 b/lib/tdb/libtdb.m4 index f5ed012..8c84736 100644 --- a/lib/tdb/libtdb.m4 +++ b/lib/tdb/libtdb.m4 @@ -1,9 +1,9 @@ dnl find the tdb sources. This is meant to work both for dnl tdb standalone builds, and builds of packages using tdb tdbdir= -tdbpaths=$srcdir $srcdir/lib/tdb $srcdir/tdb $srcdir/../tdb $srcdir/../lib/tdb +tdbpaths=. lib/tdb tdb ../tdb ../lib/tdb for d in $tdbpaths; do - if test -f $d/common/tdb.c; then + if test -f $srcdir/$d/common/tdb.c; then tdbdir=$d AC_SUBST(tdbdir) break; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-207-ge9fc7c5
The branch, master has been updated via e9fc7c5e15ed87710be8f981b969ef411de25918 (commit) from cdf025f012d6a426396da5478735663468023bd4 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e9fc7c5e15ed87710be8f981b969ef411de25918 Author: Björn Jacke b...@sernet.de Date: Fri Jul 3 19:13:08 2009 +0200 heimdal: don't include ifaddrs.h without knowing it's there this is 73dbbe0d54 re-added. abartlet, please pick this to lorikeet. --- Summary of changes: source4/heimdal/lib/krb5/get_addrs.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/heimdal/lib/krb5/get_addrs.c b/source4/heimdal/lib/krb5/get_addrs.c index 8f366fa..96571af 100644 --- a/source4/heimdal/lib/krb5/get_addrs.c +++ b/source4/heimdal/lib/krb5/get_addrs.c @@ -41,7 +41,9 @@ struct mbuf; #ifdef HAVE_NET_IF_H #include net/if.h #endif +#ifdef HAVE_IFADDR_H #include ifaddrs.h +#endif static krb5_error_code gethostname_fallback (krb5_context context, krb5_addresses *res) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-212-g1225d57
The branch, master has been updated
via 1225d57abe6c04805479138a620748653f7e2bcf (commit)
via cb39ba3d40841097c513358e7bac361aa7e38a9c (commit)
via c5415e7e09d40518e20fe12f6f9ad88e4da8369e (commit)
via bee0421f4c8017a86d00392c0efe45d2009a71f9 (commit)
via 80b62f579fdf9975c718a75c6d8e623e30578139 (commit)
from e9fc7c5e15ed87710be8f981b969ef411de25918 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1225d57abe6c04805479138a620748653f7e2bcf
Author: Günther Deschner g...@samba.org
Date: Fri Jul 3 18:39:58 2009 +0200
s3-spoolss: add rpccli_spoolss_getprinterdriver convenience wrapper.
Guenther
commit cb39ba3d40841097c513358e7bac361aa7e38a9c
Author: Günther Deschner g...@samba.org
Date: Fri Jul 3 18:39:38 2009 +0200
spoolss: fill in spoolss_GetPrinterDriver IDL.
Guenther
commit c5415e7e09d40518e20fe12f6f9ad88e4da8369e
Author: Günther Deschner g...@samba.org
Date: Fri Jul 3 14:08:05 2009 +0200
spoolss: the flags in spoolss_SetPrinterInfo1 are in fact
spoolss_PrinterAttributes.
Guenther
commit bee0421f4c8017a86d00392c0efe45d2009a71f9
Author: Günther Deschner g...@samba.org
Date: Fri Jul 3 11:05:38 2009 +0200
s3-spoolss: implement _spoolss_AddPrinter.
Guenther
commit 80b62f579fdf9975c718a75c6d8e623e30578139
Author: Günther Deschner g...@samba.org
Date: Fri Jul 3 10:10:53 2009 +0200
spoolss: fill in spoolss_AddPrinter IDL.
Guenther
---
Summary of changes:
librpc/gen_ndr/cli_spoolss.c| 26
librpc/gen_ndr/cli_spoolss.h| 12 ++
librpc/gen_ndr/ndr_spoolss.c| 243 ++-
librpc/gen_ndr/spoolss.h| 18 +++
librpc/gen_ndr/srv_spoolss.c| 37 ++
librpc/idl/spoolss.idl | 20 ++-
source3/include/proto.h |7 +
source3/rpc_client/cli_spoolss.c| 50 +++
source3/rpc_server/srv_spoolss_nt.c | 35 --
9 files changed, 429 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 1e94a2a..66083e6 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -281,12 +281,21 @@ NTSTATUS rpccli_spoolss_EnumJobs(struct rpc_pipe_client
*cli,
NTSTATUS rpccli_spoolss_AddPrinter(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
+ const char *server /* [in]
[unique,charset(UTF16)] */,
+ struct spoolss_SetPrinterInfoCtr *info_ctr
/* [in] [ref] */,
+ struct spoolss_DevmodeContainer *devmode_ctr
/* [in] [ref] */,
+ struct sec_desc_buf *secdesc_ctr /* [in]
[ref] */,
+ struct policy_handle *handle /* [out] [ref]
*/,
WERROR *werror)
{
struct spoolss_AddPrinter r;
NTSTATUS status;
/* In parameters */
+ r.in.server = server;
+ r.in.info_ctr = info_ctr;
+ r.in.devmode_ctr = devmode_ctr;
+ r.in.secdesc_ctr = secdesc_ctr;
if (DEBUGLEVEL = 10) {
NDR_PRINT_IN_DEBUG(spoolss_AddPrinter, r);
@@ -311,6 +320,7 @@ NTSTATUS rpccli_spoolss_AddPrinter(struct rpc_pipe_client
*cli,
}
/* Return variables */
+ *handle = *r.out.handle;
/* Return result */
if (werror) {
@@ -573,12 +583,24 @@ NTSTATUS rpccli_spoolss_EnumPrinterDrivers(struct
rpc_pipe_client *cli,
NTSTATUS rpccli_spoolss_GetPrinterDriver(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
+struct policy_handle *handle /* [in]
[ref] */,
+const char *architecture /* [in]
[unique,charset(UTF16)] */,
+uint32_t level /* [in] */,
+DATA_BLOB *buffer /* [in] [unique] */,
+uint32_t offered /* [in] */,
+union spoolss_DriverInfo *info /*
[out] [unique,subcontext_size(offered),subcontext(4),switch_is(level)] */,
+uint32_t *needed /* [out] [ref] */,
WERROR *werror)
{
struct spoolss_GetPrinterDriver r;
NTSTATUS status;
/* In parameters */
+ r.in.handle = handle;
+ r.in.architecture = architecture;
+ r.in.level = level;
+ r.in.buffer = buffer;
+ r.in.offered = offered;
if (DEBUGLEVEL = 10) {
NDR_PRINT_IN_DEBUG(spoolss_GetPrinterDriver, r);
@@ -603,6 +625,10 @@ NTSTATUS
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-213-g66152d2
The branch, master has been updated
via 66152d29b39aee81b7af68a6d9deea42dc249bdc (commit)
from 1225d57abe6c04805479138a620748653f7e2bcf (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 66152d29b39aee81b7af68a6d9deea42dc249bdc
Author: Volker Lendecke v...@samba.org
Date: Fri Jul 3 22:32:31 2009 +0200
Attempt to fix the build
---
Summary of changes:
source3/rpc_server/srv_spoolss_nt.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index 5c9f60f..9d72168 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -7677,12 +7677,12 @@ WERROR _spoolss_AddPrinterEx(pipes_struct *p,
WERROR _spoolss_AddPrinter(pipes_struct *p,
struct spoolss_AddPrinter *r)
{
- struct _spoolss_AddPrinterEx a;
+ struct spoolss_AddPrinterEx a;
struct spoolss_UserLevelCtr userlevel_ctr;
ZERO_STRUCT(userlevel_ctr);
- user_level_ctr.level = 1;
+ userlevel_ctr.level = 1;
a.in.server = r-in.server;
a.in.info_ctr = r-in.info_ctr;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-217-gcfacece
The branch, master has been updated
via cfacece9ed96dc46c12f20990110c6528080bc32 (commit)
via 520b6c0d5010731f6f512a9eb038f28adfd9cd03 (commit)
via 7e560bd802c2869d4280f15bde100bbda944b70b (commit)
via 56ae65ad5c0b9d4ef51dd06bd8a67841de2b57d3 (commit)
from 66152d29b39aee81b7af68a6d9deea42dc249bdc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit cfacece9ed96dc46c12f20990110c6528080bc32
Author: Volker Lendecke v...@samba.org
Date: Tue Jun 30 20:06:55 2009 +0200
tldap: Do not do a return before we got the search_result
commit 520b6c0d5010731f6f512a9eb038f28adfd9cd03
Author: Volker Lendecke v...@samba.org
Date: Thu Jul 2 11:06:21 2009 +0200
Fix two pointless statics
commit 7e560bd802c2869d4280f15bde100bbda944b70b
Author: Volker Lendecke v...@samba.org
Date: Fri Jul 3 22:36:11 2009 +0200
For non-existent streams we have to return OBJECT_NAME_NOT_FOUND
See the STREAMERROR s3 torture test.
Jeremy, Tim, please check!
commit 56ae65ad5c0b9d4ef51dd06bd8a67841de2b57d3
Author: Volker Lendecke v...@samba.org
Date: Thu Jul 2 11:56:33 2009 +0200
Test error codes on popular streams
---
Summary of changes:
source3/lib/tldap_util.c |1 -
source3/script/tests/test_smbtorture_s3.sh |2 +-
source3/smbd/open.c|2 +-
source3/torture/torture.c | 56 +++-
4 files changed, 57 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/tldap_util.c b/source3/lib/tldap_util.c
index f3a8c71..73ce854 100644
--- a/source3/lib/tldap_util.c
+++ b/source3/lib/tldap_util.c
@@ -457,7 +457,6 @@ static void tldap_fetch_rootdse_done(struct tevent_req
*subreq)
default:
goto protocol_error;
}
- tevent_req_done(req);
return;
protocol_error:
diff --git a/source3/script/tests/test_smbtorture_s3.sh
b/source3/script/tests/test_smbtorture_s3.sh
index 4e439fe..c577ed1 100755
--- a/source3/script/tests/test_smbtorture_s3.sh
+++ b/source3/script/tests/test_smbtorture_s3.sh
@@ -24,7 +24,7 @@ incdir=`dirname $0`
tests=FDPASS LOCK1 LOCK2 LOCK3 LOCK4 LOCK5 LOCK6 LOCK7
#tests=$tests UNLINK BROWSE ATTR TRANS2 MAXFID TORTURE
tests=$tests UNLINK BROWSE ATTR TRANS2 TORTURE
-tests=$tests OPLOCK1 OPLOCK2 OPLOCK3
+tests=$tests OPLOCK1 OPLOCK2 OPLOCK3 STREAMERROR
tests=$tests DIR DIR1 TCON TCONDEV RW1 RW2 RW3
tests=$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K
tests=$tests TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE CHAIN1
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 21e5804..df31365 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -3487,7 +3487,7 @@ NTSTATUS create_file_default(connection_struct *conn,
TALLOC_FREE(fname);
if (!(conn-fs_capabilities FILE_NAMED_STREAMS)) {
- status = NT_STATUS_OBJECT_PATH_NOT_FOUND;
+ status = NT_STATUS_OBJECT_NAME_NOT_FOUND;
goto fail;
}
}
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 8880104..012f893 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -705,7 +705,7 @@ static bool rw_torture2(struct cli_state *c1, struct
cli_state *c2)
static bool run_readwritetest(int dummy)
{
- static struct cli_state *cli1, *cli2;
+ struct cli_state *cli1, *cli2;
bool test1, test2 = False;
if (!torture_open_connection(cli1, 0) ||
!torture_open_connection(cli2, 1)) {
@@ -5675,6 +5675,59 @@ static bool run_tldap(int dummy)
return true;
}
+static bool run_streamerror(int dummy)
+{
+ struct cli_state *cli;
+ const char *dname = \\testdir;
+ const char *streamname =
+ testdir:{4c8cc155-6c1e-11d1-8e41-00c04fb9386d}:$DATA;
+ NTSTATUS status;
+ time_t change_time, access_time, write_time;
+ SMB_OFF_T size;
+ uint16_t mode, fnum;
+ bool ret = true;
+
+ if (!torture_open_connection(cli, 0)) {
+ return false;
+ }
+
+ cli_rmdir(cli, dname);
+
+ status = cli_mkdir(cli, dname);
+ if (!NT_STATUS_IS_OK(status)) {
+ printf(mkdir failed: %s\n, nt_errstr(status));
+ return false;
+ }
+
+ cli_qpathinfo(cli, streamname, change_time, access_time, write_time,
+ size, mode);
+ status = cli_nt_error(cli);
+
+ if (!NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
+ printf(pathinfo returned %s, expected
+ NT_STATUS_OBJECT_NAME_NOT_FOUND\n,
+ nt_errstr(status));
+ ret = false;
+ }
+
+ status = cli_ntcreate(cli, streamname,
Re: [SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-154-g826ee30
On Jun 30, 2009, at 10:16 PM, Andrew Tridgell wrote
commit 5fe1d8dc1275e43d96da1297f5fb0d0088a1c3ab
Author: Andrew Tridgell tri...@samba.org
Date: Wed Jul 1 14:53:01 2009 +1000
changes to remove the ambiguity in talloc_free() and talloc_steal()
Tridge, this patch introduced two new warnings that should be fixed.
Compiling ../lib/talloc/talloc.c
cc1: warnings being treated as errors
../lib/talloc/talloc.c: In function 'talloc_reparent':
../lib/talloc/talloc.c:726: warning: return discards qualifiers from
pointer target type
../lib/talloc/talloc.c: In function '_talloc_move':
../lib/talloc/talloc.c:1186: warning: initialization discards
qualifiers from pointer target type
726: In talloc_reparent you can't take in a const void *, and then
return it as a void *.
1186: The second one is actually happening in the talloc_steal macro
and could be fixed by actually discarding the const:
@@ -1182,7 +1182,7 @@ void *_talloc_realloc(const void *context, void
*ptr, size_t size, const char *n
*/
void *_talloc_move(const void *new_ctx, const void *_pptr)
{
- const void **pptr = discard_const_p(const void *,_pptr);
+ void **pptr = discard_const_p(void *,_pptr);
void *ret = talloc_steal(new_ctx, *pptr);
(*pptr) = NULL;
return ret;
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-218-g077808f
The branch, master has been updated via 077808f91610e70c2105b837a2704842191d1e3c (commit) from cfacece9ed96dc46c12f20990110c6528080bc32 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 077808f91610e70c2105b837a2704842191d1e3c Author: Björn Jacke b...@sernet.de Date: Sat Jul 4 01:07:15 2009 +0200 s3/s4:build: honor library path from environment we may not throw away LD_LIBRARY_PATH and friends as they sometimes contain important information. Some of the build farm machines for example have the python lib path in there - we can't run make test when we suddenly forget how to use python --- Summary of changes: source3/Makefile.in |2 +- source3/samba4.mk |2 +- source4/Makefile|2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index 01ab5f0..dd133df 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -3203,7 +3203,7 @@ valgrindtest:: all torture timelimit SELFTEST_FORMAT = plain selftestdir = ../selftest -S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(builddir)/bin +S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(builddir)/bin:$$$(LIB_PATH_VAR) selftest:: all torture timelimit @LIB_PATH_VAR=$(LIB_PATH_VAR) $(S3_LD_LIBPATH_OVERRIDE) \ diff --git a/source3/samba4.mk b/source3/samba4.mk index e63a845..653ae25 100644 --- a/source3/samba4.mk +++ b/source3/samba4.mk @@ -172,7 +172,7 @@ everything:: $(patsubst %,%4,$(BINARIES)) setup: @ln -sf ../source4/setup setup -S4_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(builddir)/bin/shared +S4_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(builddir)/bin/shared:$$$(LIB_PATH_VAR) SELFTEST4 = $(S4_LD_LIBPATH_OVERRIDE) EXEEXT=4 PYTHON=$(PYTHON) PERL=$(PERL) \ $(PERL) $(selftestdir)/selftest.pl --prefix=st4 \ diff --git a/source4/Makefile b/source4/Makefile index d6ce517..d6ae887 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -163,7 +163,7 @@ manpages:: $(MANPAGES) all:: showflags $(ALL_PREDEP) binaries modules pythonmods libraries headers everything:: all -LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(shliboutputdir) +LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(shliboutputdir):$$$(LIB_PATH_VAR) # 'make testsuite' creates all binaries which are # needed by samba3's 'make test' and the build-farm -- Samba Shared Repository
Build status as of Sat Jul 4 00:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-07-03 00:00:22.0 + +++ /home/build/master/cache/broken_results.txt 2009-07-04 00:00:15.0 + @@ -1,22 +1,22 @@ -Build status as of Fri Jul 3 00:00:02 2009 +Build status as of Sat Jul 4 00:00:02 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 30 6 0 +ccache 32 7 0 distcc 0 0 0 -ldb 30 30 0 -libreplace 29 11 0 +ldb 33 33 0 +libreplace 32 13 0 lorikeet 0 0 0 -pidl 20 2 0 +pidl 22 2 0 ppp 12 0 0 -rsync29 11 0 +rsync33 12 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 28 19 0 -samba_3_master 28 21 1 -samba_3_next 28 24 0 -samba_4_0_test 29 27 7 -talloc 30 29 0 -tdb 28 24 0 +samba_3_current 30 18 0 +samba_3_master 29 24 2 +samba_3_next 29 25 1 +samba_4_0_test 30 26 11 +talloc 33 32 0 +tdb 30 28 0
