summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-10-30 10:19:45 -0700
committerJeremy Allison <jra@samba.org>2007-10-30 10:19:45 -0700
commit9da9423f21bae8e714e735f7493eef8ddb4760df (patch)
tree2e042ebf96227be72f2eb7a16f14be9fe433eefa /source3
parent0af071d7628106e3d919018ed8604c9da2af4d50 (diff)
parent851ef9e22f5f58202b0c5594b4432941afb0e130 (diff)
downloadsamba-9da9423f21bae8e714e735f7493eef8ddb4760df.tar.gz
samba-9da9423f21bae8e714e735f7493eef8ddb4760df.tar.bz2
samba-9da9423f21bae8e714e735f7493eef8ddb4760df.zip
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit c833c336435cffd20579903d22ccb910ab467e53)
Diffstat (limited to 'source3')
-rw-r--r--source3/nmbd/nmbd.c4
-rw-r--r--source3/smbd/server.c4
-rw-r--r--source3/winbindd/winbindd.c5
3 files changed, 6 insertions, 7 deletions
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index c6be4914da..6fadefe682 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -812,8 +812,8 @@ static bool open_sockets(bool isdaemon, int port)
reopen_logs();
- DEBUG( 0, ( "Netbios nameserver version %s started.\n", SAMBA_VERSION_STRING) );
- DEBUGADD( 0, ( "%s\n", COPYRIGHT_STARTUP_MESSAGE ) );
+ DEBUG(0,("nmbd version %s started.\n", SAMBA_VERSION_STRING));
+ DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
if ( !reload_nmbd_services(False) )
return(-1);
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index bcf997f2d2..b9ab7ef7ac 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1057,8 +1057,8 @@ extern void build_options(bool screen);
reopen_logs();
- DEBUG(0,( "smbd version %s started.\n", SAMBA_VERSION_STRING));
- DEBUGADD( 0, ( "%s\n", COPYRIGHT_STARTUP_MESSAGE ) );
+ DEBUG(0,("smbd version %s started.\n", SAMBA_VERSION_STRING));
+ DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
DEBUG(2,("uid=%d gid=%d euid=%d egid=%d\n",
(int)getuid(),(int)getgid(),(int)geteuid(),(int)getegid()));
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 8449795e13..ee993efca5 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1091,9 +1091,8 @@ int main(int argc, char **argv, char **envp)
setup_logging("winbindd", log_stdout);
reopen_logs();
- DEBUG(1, ("winbindd version %s started.\n%s\n",
- SAMBA_VERSION_STRING,
- COPYRIGHT_STARTUP_MESSAGE) );
+ DEBUG(0,("winbindd version %s started.\n", SAMBA_VERSION_STRING));
+ DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
if (!reload_services_file()) {
DEBUG(0, ("error opening config file\n"));