[SCM] Samba Shared Repository - branch v3-6-test updated
Stefan Metzmacher
metze at samba.org
Mon Jan 24 09:20:39 MST 2011
The branch, v3-6-test has been updated
via f08f449 drsuapi.idl: add some more DRSUAPI_ATTID_* values
via 7d0b03e lib/replace/testsuite.c - fix test output (cherry picked from commit da78e24ca201dcdac8a498a5d0da8c30154d4d9a)
via 9d2567e tdbrestore: Update to GPLv3+, remove old FSF address. (cherry picked from commit 24d5a7202ab521b92eb07c93647ae2d381e181a5)
via d132658 s4-dns: disable segfault handling in dlz_bind9
via 5cb58b7 lib/util/time.c - make the "strftime" output locale independant ("%c" is not)
via 5617a71 Revert "lib/util:tests/time.c - "test_timestring" - fix it on Solaris"
via fa98c8e lib/util:tests/time.c - "test_timestring" - fix it on Solaris
from e08e530 s3-waf: fix lib/addns include path.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit f08f449cc074e32d54da62521c2598d5ac9b3eb5
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Jan 12 15:48:30 2011 +0100
drsuapi.idl: add some more DRSUAPI_ATTID_* values
These will be use for "net rpc vampire passwd" in source3.
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Wed Jan 12 19:51:53 CET 2011 on sn-devel-104
(cherry picked from commit c39e80094b91ac7055faee61a8137d47e9e76c43)
commit 7d0b03e676fbb977c3e83bb077f19551be796587
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Thu Dec 23 12:42:37 2010 +0100
lib/replace/testsuite.c - fix test output
(cherry picked from commit da78e24ca201dcdac8a498a5d0da8c30154d4d9a)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 9d2567e7a0c602afdcf8e2146bcaee509dec902a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Jan 5 13:52:34 2011 +0100
tdbrestore: Update to GPLv3+, remove old FSF address.
(cherry picked from commit 24d5a7202ab521b92eb07c93647ae2d381e181a5)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit d132658fbe61a2904dd04e915adc7c5d0f686ea2
Author: Stefan Metzmacher <metze at samba.org>
Date: Sat Jan 15 02:24:51 2011 +0100
s4-dns: disable segfault handling in dlz_bind9
we don't want bind9 calling the Samba segv handler
(cherry picked from commit da5c328b4b4a793053a8b1c942ceda56da01625c)
Only the lib/util part...
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 5cb58b7d29ee142df864b0d844adff865ba04454
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Wed Dec 22 09:53:27 2010 +0100
lib/util/time.c - make the "strftime" output locale independant ("%c" is not)
So that it also works on Solaris.
(cherry picked from commit 07bcf6197d9fbdc038513ae3db7f83a9bb8a6cd9)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 5617a71e2ed28eb129c8854aa3ae18c98c409c59
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Mon Dec 6 11:28:22 2010 +0100
Revert "lib/util:tests/time.c - "test_timestring" - fix it on Solaris"
This reverts commit 654e0102ddb0acaaf45fb55c15818722235fcc9f.
This should better be handled by the replace library.
Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
Autobuild-Date: Mon Dec 6 12:17:31 CET 2010 on sn-devel-104
(cherry picked from commit bd3e5804a41fdfc8a43bebd95c53e4f0ff1d7a10)
commit fa98c8ec3fa805790491d2fed76c9fa79ed289d1
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sun Dec 5 22:20:06 2010 +0100
lib/util:tests/time.c - "test_timestring" - fix it on Solaris
Solaris returns "Thu Jan 01" and not "Thu Jan 1" - therefore proof for
both.
Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
Autobuild-Date: Sun Dec 5 23:09:13 CET 2010 on sn-devel-104
(cherry picked from commit 654e0102ddb0acaaf45fb55c15818722235fcc9f)
-----------------------------------------------------------------------
Summary of changes:
lib/replace/test/testsuite.c | 2 +-
lib/tdb/tools/tdbrestore.c | 5 ++---
lib/util/fault.c | 14 ++++++++++++--
lib/util/tests/time.c | 3 +--
lib/util/time.c | 9 ++++-----
lib/util/util.h | 1 +
librpc/idl/drsuapi.idl | 5 +++++
7 files changed, 26 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/test/testsuite.c b/lib/replace/test/testsuite.c
index 1f242eb..0e455f2 100644
--- a/lib/replace/test/testsuite.c
+++ b/lib/replace/test/testsuite.c
@@ -771,7 +771,7 @@ static int test_FUNCTION(void)
{
printf("test: FUNCTION\n");
if (strcmp(__FUNCTION__, "test_FUNCTION") != 0) {
- printf("failure: FAILURE [\nFAILURE invalid\n]\n");
+ printf("failure: FUNCTION [\nFUNCTION invalid\n]\n");
return false;
}
printf("success: FUNCTION\n");
diff --git a/lib/tdb/tools/tdbrestore.c b/lib/tdb/tools/tdbrestore.c
index 601cd5e..95ee360 100644
--- a/lib/tdb/tools/tdbrestore.c
+++ b/lib/tdb/tools/tdbrestore.c
@@ -5,7 +5,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <assert.h>
diff --git a/lib/util/fault.c b/lib/util/fault.c
index bbb3190..256e55a 100644
--- a/lib/util/fault.c
+++ b/lib/util/fault.c
@@ -187,9 +187,10 @@ setup our fault handlers
**/
_PUBLIC_ void fault_setup(const char *pname)
{
- if (progname == NULL) {
- progname = pname;
+ if (progname != NULL) {
+ return;
}
+ progname = pname;
#ifdef SIGSEGV
CatchSignal(SIGSEGV, sig_fault);
#endif
@@ -205,6 +206,15 @@ _PUBLIC_ void fault_setup(const char *pname)
}
/**
+ disable setting up fault handlers
+**/
+_PUBLIC_ void fault_setup_disable(void)
+{
+ progname = "fault disabled";
+}
+
+
+/**
register a fault handler.
Should only be called once in the execution of smbd.
*/
diff --git a/lib/util/tests/time.c b/lib/util/tests/time.c
index 73196f2..592f88f 100644
--- a/lib/util/tests/time.c
+++ b/lib/util/tests/time.c
@@ -77,8 +77,7 @@ static bool test_timestring(struct torture_context *tctx)
time_t utc_offset = mktime(&local) - mktime(&gmt);
result = timestring(tctx, 42 - (utc_offset < 0 ? utc_offset : 0));
- torture_assert(tctx, !strncmp(start, result, strlen(start)),
- result);
+ torture_assert(tctx, !strncmp(start, result, strlen(start)), result);
return true;
}
diff --git a/lib/util/time.c b/lib/util/time.c
index 7c1532a..770ebc4 100644
--- a/lib/util/time.c
+++ b/lib/util/time.c
@@ -384,11 +384,10 @@ _PUBLIC_ char *timestring(TALLOC_CTX *mem_ctx, time_t t)
}
#ifdef HAVE_STRFTIME
- /* some versions of gcc complain about using %c. This is a bug
- in the gcc warning, not a bug in this code. See a recent
- strftime() manual page for details.
- */
- strftime(tempTime,sizeof(tempTime)-1,"%c %Z",tm);
+ /* Some versions of gcc complain about using some special format
+ * specifiers. This is a bug in gcc, not a bug in this code. See a
+ * recent strftime() manual page for details. */
+ strftime(tempTime,sizeof(tempTime)-1,"%a %b %e %X %Y %Z",tm);
TimeBuf = talloc_strdup(mem_ctx, tempTime);
#else
TimeBuf = talloc_strdup(mem_ctx, asctime(tm));
diff --git a/lib/util/util.h b/lib/util/util.h
index c730010..8f4fd8f 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -87,6 +87,7 @@ _PUBLIC_ _NORETURN_ void smb_panic(const char *why);
setup our fault handlers
**/
_PUBLIC_ void fault_setup(const char *pname);
+_PUBLIC_ void fault_setup_disable(void);
#endif
/**
diff --git a/librpc/idl/drsuapi.idl b/librpc/idl/drsuapi.idl
index bc21b22..e5b572d 100644
--- a/librpc/idl/drsuapi.idl
+++ b/librpc/idl/drsuapi.idl
@@ -416,11 +416,14 @@ interface drsuapi
DRSUAPI_ATTID_lDAPDisplayName = 0x000201cc,
DRSUAPI_ATTID_name = 0x00090001,
DRSUAPI_ATTID_userAccountControl = 0x00090008,
+ DRSUAPI_ATTID_badPwdCount = 0x0009000c,
DRSUAPI_ATTID_codePage = 0x00090010,
DRSUAPI_ATTID_countryCode = 0x00090019,
DRSUAPI_ATTID_currentValue = 0x0009001b,
DRSUAPI_ATTID_homeDirectory = 0x0009002c,
DRSUAPI_ATTID_homeDrive = 0x0009002d,
+ DRSUAPI_ATTID_lastLogoff = 0x00090033,
+ DRSUAPI_ATTID_lastLogon = 0x00090034,
DRSUAPI_ATTID_dBCSPwd = 0x00090037,/* lmPwdHash */
DRSUAPI_ATTID_scriptPath = 0x0009003e,
DRSUAPI_ATTID_logonHours = 0x00090040,
@@ -433,12 +436,14 @@ interface drsuapi
DRSUAPI_ATTID_supplementalCredentials = 0x0009007d,
DRSUAPI_ATTID_trustAuthIncoming = 0x00090081,
DRSUAPI_ATTID_trustAuthOutgoing = 0x00090087,
+ DRSUAPI_ATTID_userParameters = 0x0009008a,
DRSUAPI_ATTID_profilePath = 0x0009008b,
DRSUAPI_ATTID_objectSid = 0x00090092,
DRSUAPI_ATTID_schemaIDGUID = 0x00090094,
DRSUAPI_ATTID_comment = 0x0009009C,/* User-Comment */
DRSUAPI_ATTID_accountExpires = 0x0009009f,
DRSUAPI_ATTID_lmPwdHistory = 0x000900a0,
+ DRSUAPI_ATTID_logonCount = 0x000900a9,
DRSUAPI_ATTID_systemPossSuperiors = 0x000900c3,
DRSUAPI_ATTID_systemMayContain = 0x000900c4,
DRSUAPI_ATTID_systemMustContain = 0x000900c5,
--
Samba Shared Repository
More information about the samba-cvs
mailing list