diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-03-23 10:25:01 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-03-23 11:03:57 +1100 |
| commit | 058c3bb923c51ef3f1b4b6d698bea2b1220bdd10 (patch) | |
| tree | 590ac35b3a936d413e2c9a4fdc792399b3f219b0 | |
| parent | cb2cc34effedca2af4e9f6d57303ccc779a9cc04 (diff) | |
| download | samba-058c3bb923c51ef3f1b4b6d698bea2b1220bdd10.tar.gz samba-058c3bb923c51ef3f1b4b6d698bea2b1220bdd10.tar.bz2 samba-058c3bb923c51ef3f1b4b6d698bea2b1220bdd10.zip | |
fault: moved s3 fault.c to top level
| -rw-r--r-- | lib/util/fault.c (renamed from source3/lib/fault.c) | 11 | ||||
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rwxr-xr-x | source3/wscript_build | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/source3/lib/fault.c b/lib/util/fault.c index 8bb202086e..2ffd5dbd6d 100644 --- a/source3/lib/fault.c +++ b/lib/util/fault.c @@ -1,19 +1,19 @@ -/* +/* Unix SMB/CIFS implementation. Critical Fault handling Copyright (C) Andrew Tridgell 1992-1998 Copyright (C) Tim Prouty 2009 - + 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 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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, see <http://www.gnu.org/licenses/>. */ @@ -47,7 +47,7 @@ static void fault_report(int sig) DEBUG(0,("\nPlease read the Trouble-Shooting section of the Samba3-HOWTO\n")); DEBUG(0,("\nFrom: http://www.samba.org/samba/docs/Samba3-HOWTO.pdf\n")); DEBUGSEP(0); - + smb_panic("internal error"); /* smb_panic() never returns, so this is really redundent */ @@ -378,4 +378,3 @@ void dump_core_setup(const char *progname) exit(1); #endif /* DUMP_CORE */ } - diff --git a/source3/Makefile.in b/source3/Makefile.in index 05f1ccd8d4..7ba8332eb0 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -442,7 +442,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \ lib/util_transfer_file.o ../lib/async_req/async_sock.o \ lib/addrchange.o \ $(TDB_LIB_OBJ) \ - $(VERSION_OBJ) lib/charcnv.o ../lib/util/debug.o ../lib/util/debug_s3.o lib/fault.o \ + $(VERSION_OBJ) lib/charcnv.o ../lib/util/debug.o ../lib/util/debug_s3.o ../lib/util/fault.o \ lib/interface.o lib/pidfile.o \ lib/system.o lib/sendfile.o lib/recvfile.o lib/time.o \ lib/username.o \ diff --git a/source3/wscript_build b/source3/wscript_build index e02593d654..fd9e4f488b 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -69,7 +69,7 @@ LIB_SRC = ''' lib/util_transfer_file.c lib/addrchange.c ${TDB_LIB_SRC} - ../lib/util/debug_s3.c lib/fault.c + ../lib/util/debug_s3.c ../lib/util/fault.c lib/interface.c lib/pidfile.c lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c lib/username.c |