The branch, master has been updated
via 415c615... s4:util.c - Corrected the location of the "Directory
Service" object
via eed65ed... s4:server.c - use always "return" instead of "exit" in
the "binary_smbd_main" function
from 9848086... libwbclient: Fix s4 build failure by fixing up includes.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 415c615dbf50e810e26d40169c78bbaf9de88e3e
Author: Matthias Dieter Wallnöfer <mwallnoe...@yahoo.de>
Date: Sat Feb 13 18:20:54 2010 +0100
s4:util.c - Corrected the location of the "Directory Service" object
I wonder why nobody noticed this since for sure this "tombstone"
functionality
was broken till now.
commit eed65ed337ae89f864dd833cc39c2f75c5ac3e67
Author: Matthias Dieter Wallnöfer <mwallnoe...@yahoo.de>
Date: Sat Feb 13 18:03:08 2010 +0100
s4:server.c - use always "return" instead of "exit" in the
"binary_smbd_main" function
Just to be consistent - no functional change
-----------------------------------------------------------------------
Summary of changes:
source4/dsdb/common/util.c | 2 +-
source4/smbd/server.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index a26ffc2..d659767 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -3213,7 +3213,7 @@ int dsdb_tombstone_lifetime(struct ldb_context *ldb,
uint32_t *lifetime)
}
/* see MS-ADTS section 7.1.1.2.4.1.1. There doesn't appear to
be a wellknown GUID for this */
- if (!ldb_dn_add_child_fmt(dn, "CN=Directory Service,CN=Windows NT")) {
+ if (!ldb_dn_add_child_fmt(dn, "CN=Directory Service,CN=Windows
NT,CN=Services")) {
talloc_free(dn);
return LDB_ERR_OPERATIONS_ERROR;
}
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 7194827..91fd553 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -303,7 +303,7 @@ static int binary_smbd_main(const char *binary_name, int
argc, const char *argv[
fprintf(stderr, "\nInvalid option %s: %s\n\n",
poptBadOption(pc, 0), poptStrerror(opt));
poptPrintUsage(pc, stderr, 0);
- exit(1);
+ return 1;
}
}
@@ -311,7 +311,7 @@ static int binary_smbd_main(const char *binary_name, int
argc, const char *argv[
fprintf(stderr,"\nERROR: "
"Option -i|--interactive is not allowed together with
-D|--daemon\n\n");
poptPrintUsage(pc, stderr, 0);
- exit(1);
+ return 1;
} else if (!opt_interactive) {
/* default is --daemon */
opt_daemon = true;
@@ -333,7 +333,7 @@ static int binary_smbd_main(const char *binary_name, int
argc, const char *argv[
DEBUG(0,("ERROR: Samba is not configured correctly for the word
size on your machine\n"));
DEBUGADD(0,("sizeof(uint16_t) = %u, sizeof(uint32_t) %u,
sizeof(uint64_t) = %u\n",
(unsigned int)sizeof(uint16_t), (unsigned
int)sizeof(uint32_t), (unsigned int)sizeof(uint64_t)));
- exit(1);
+ return 1;
}
if (opt_daemon) {
@@ -353,7 +353,7 @@ static int binary_smbd_main(const char *binary_name, int
argc, const char *argv[
* passdb/secrets.c, and proved that Samba still builds... */
/* Setup the SECRETS subsystem */
if (secrets_init(talloc_autofree_context(), cmdline_lp_ctx) == NULL) {
- exit(1);
+ return 1;
}
gensec_init(cmdline_lp_ctx); /* FIXME: */
--
Samba Shared Repository
