diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-01-28 12:47:52 +0000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2004-01-28 12:47:52 +0000 |
| commit | e06687eb174d5ca785a6c67fa63a99ea019182c4 (patch) | |
| tree | 31820abce3978d9b1b6ea5120dbeb22dab7184d0 /source4/smbd | |
| parent | 2ffa2fe1654d3f3d7f0ba17d73c3f8db5710b38e (diff) | |
| download | samba-e06687eb174d5ca785a6c67fa63a99ea019182c4.tar.gz samba-e06687eb174d5ca785a6c67fa63a99ea019182c4.tar.bz2 samba-e06687eb174d5ca785a6c67fa63a99ea019182c4.zip | |
merge the version.h autogeneration stuff from 3.0
metze
(This used to be commit 24dc237e109f6dce69814b22e0fb7878a7f6bfa8)
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/process_thread.c | 4 | ||||
| -rw-r--r-- | source4/smbd/server.c | 2 | ||||
| -rw-r--r-- | source4/smbd/sesssetup.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c index d83f48de9f..bd64166355 100644 --- a/source4/smbd/process_thread.c +++ b/source4/smbd/process_thread.c @@ -373,7 +373,7 @@ catch serious errors static void thread_sig_fault(int sig) { DEBUG(0,("===============================================================\n")); - DEBUG(0,("TERMINAL ERROR: Recursive signal %d in thread %lu (%s)\n",sig,(unsigned long int)pthread_self(),SAMBA_VERSION)); + DEBUG(0,("TERMINAL ERROR: Recursive signal %d in thread %lu (%s)\n",sig,(unsigned long int)pthread_self(),SAMBA_VERSION_STRING)); DEBUG(0,("===============================================================\n")); exit(1); /* kill the whole server for now */ } @@ -407,7 +407,7 @@ static void thread_fault_handler(int sig) counter++; /* count number of faults that have occurred */ DEBUG(0,("===============================================================\n")); - DEBUG(0,("INTERNAL ERROR: Signal %d in thread %lu (%s)\n",sig,(unsigned long int)pthread_self(),SAMBA_VERSION)); + DEBUG(0,("INTERNAL ERROR: Signal %d in thread %lu (%s)\n",sig,(unsigned long int)pthread_self(),SAMBA_VERSION_STRING)); DEBUG(0,("Please read the file BUGS.txt in the distribution\n")); DEBUG(0,("===============================================================\n")); #ifdef HAVE_BACKTRACE diff --git a/source4/smbd/server.c b/source4/smbd/server.c index 914271100f..67bf07c7f8 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -298,7 +298,7 @@ static void setup_process_model(struct event_context *events, reopen_logs(); - DEBUG(0,("smbd version %s started.\n", SAMBA_VERSION)); + DEBUG(0,("smbd version %s started.\n", SAMBA_VERSION_STRING)); DEBUGADD(0,("Copyright Andrew Tridgell and the Samba Team 1992-2004\n")); /* Output the build options to the debug log */ diff --git a/source4/smbd/sesssetup.c b/source4/smbd/sesssetup.c index c1ea446c3c..14e300c191 100644 --- a/source4/smbd/sesssetup.c +++ b/source4/smbd/sesssetup.c @@ -30,7 +30,7 @@ static void sesssetup_common_strings(struct request_context *req, char **os, char **lanman, char **domain) { (*os) = talloc_asprintf(req->mem_ctx, "Unix"); - (*lanman) = talloc_asprintf(req->mem_ctx, "Samba %s", SAMBA_VERSION); + (*lanman) = talloc_asprintf(req->mem_ctx, "Samba %s", SAMBA_VERSION_STRING); (*domain) = talloc_asprintf(req->mem_ctx, "%s", lp_workgroup()); } |