From 05fc3e578c895f632b351969d09cd00feb7599c7 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 4 Jun 2001 05:13:59 +0000 Subject: use LDSHFLAGS not -shared in several places (This used to be commit 8ec9c87b5d1a7dae17d5b1a30f58effaf5e69e4b) --- source3/Makefile.in | 6 +++--- source3/groupdb/mapping.c | 2 +- source3/lib/messages.c | 2 +- source3/libsmb/unexpected.c | 2 +- source3/locking/brlock.c | 2 +- source3/locking/locking.c | 2 +- source3/locking/posix.c | 4 ++-- source3/nsswitch/winbindd_cache.c | 2 +- source3/nsswitch/winbindd_idmap.c | 2 +- source3/passdb/pdb_tdb.c | 14 +++++++------- source3/passdb/secrets.c | 2 +- source3/printing/nt_printing.c | 2 +- source3/printing/printing.c | 2 +- source3/rpc_server/srv_srvsvc_nt.c | 2 +- source3/smbd/session.c | 2 +- source3/utils/smbcontrol.c | 2 +- source3/utils/status.c | 2 +- source3/web/statuspage.c | 2 +- 18 files changed, 27 insertions(+), 27 deletions(-) diff --git a/source3/Makefile.in b/source3/Makefile.in index 451b7ed4c5..1e77a78ad9 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -610,7 +610,7 @@ bin/smbwrapper.32.@SHLIBEXT@: $(PICOBJS32) bin/libsmbclient.so: $(LIBSMBCLIENT_PICOBJS) @echo Linking libsmbclient shared library $@ - @$(LD) -shared -o $@ $(LIBSMBCLIENT_PICOBJS) $(LIBS) # Anything else? + @$(LD) @LDSHFLAGS@ -o $@ $(LIBSMBCLIENT_PICOBJS) $(LIBS) # Anything else? client/testsmbc: client/testsmbc.o bin/libsmbclient.so @echo Linking testsmbc @@ -630,11 +630,11 @@ bin/winbindd: $(WINBINDD_OBJ) bin/.dummy nsswitch/libnss_winbind.so: $(WINBIND_NSS_PICOBJS) @echo "Linking $@" - @$(LINK) -shared -o $@ $(WINBIND_NSS_PICOBJS) + @$(LINK) @LDSHFLAGS@ -o $@ $(WINBIND_NSS_PICOBJS) nsswitch/pam_winbind.so: $(PAM_WINBIND_OBJ) bin/.dummy @echo Linking $@ - @$(LINK) -shared -o $@ $(PAM_WINBIND_OBJ) + @$(LINK) @LDSHFLAGS@ -o $@ $(PAM_WINBIND_OBJ) bin/wbinfo: $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) $(UBIQX_OBJ) bin/.dummy @echo Linking $@ diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c index 2f258ea724..8623e0ce3d 100644 --- a/source3/groupdb/mapping.c +++ b/source3/groupdb/mapping.c @@ -130,7 +130,7 @@ BOOL init_group_mapping(void) char *vstring = "INFO/version"; if (tdb && local_pid == sys_getpid()) return True; - tdb = tdb_open(lock_path("group_mapping.tdb"), 0, 0, O_RDWR|O_CREAT, 0600); + tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, 0, O_RDWR|O_CREAT, 0600); if (!tdb) { DEBUG(0,("Failed to open group mapping database\n")); return False; diff --git a/source3/lib/messages.c b/source3/lib/messages.c index b18cebf6cf..ffa873960e 100644 --- a/source3/lib/messages.c +++ b/source3/lib/messages.c @@ -89,7 +89,7 @@ BOOL message_init(void) { if (tdb) return True; - tdb = tdb_open(lock_path("messages.tdb"), + tdb = tdb_open_log(lock_path("messages.tdb"), 0, TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT,0600); diff --git a/source3/libsmb/unexpected.c b/source3/libsmb/unexpected.c index 6c5dd611a9..d757551963 100644 --- a/source3/libsmb/unexpected.c +++ b/source3/libsmb/unexpected.c @@ -49,7 +49,7 @@ void unexpected_packet(struct packet_struct *p) int len=0; if (!tdbd) { - tdbd = tdb_open(lock_path("unexpected.tdb"), 1, + tdbd = tdb_open_log(lock_path("unexpected.tdb"), 1, TDB_CLEAR_IF_FIRST, O_RDWR | O_CREAT, 0644); if (!tdbd) { diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 552ea617aa..8f73327830 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -176,7 +176,7 @@ void brl_init(int read_only) if (tdb) return; - tdb = tdb_open(lock_path("brlock.tdb"), 0, TDB_CLEAR_IF_FIRST, + tdb = tdb_open_log(lock_path("brlock.tdb"), 0, TDB_CLEAR_IF_FIRST, read_only?O_RDONLY:(O_RDWR|O_CREAT), 0644); if (!tdb) { DEBUG(0,("Failed to open byte range locking database\n")); diff --git a/source3/locking/locking.c b/source3/locking/locking.c index c2d3106a67..c77a86cbf4 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -282,7 +282,7 @@ BOOL locking_init(int read_only) if (tdb) return True; - tdb = tdb_open(lock_path("locking.tdb"), + tdb = tdb_open_log(lock_path("locking.tdb"), 0, TDB_CLEAR_IF_FIRST, read_only?O_RDONLY:O_RDWR|O_CREAT, 0644); diff --git a/source3/locking/posix.c b/source3/locking/posix.c index 75fc6272b5..9cfe25ed9d 100644 --- a/source3/locking/posix.c +++ b/source3/locking/posix.c @@ -1350,14 +1350,14 @@ BOOL posix_locking_init(int read_only) return True; if (!posix_lock_tdb) - posix_lock_tdb = tdb_open(NULL, 0, TDB_INTERNAL, + posix_lock_tdb = tdb_open_log(NULL, 0, TDB_INTERNAL, read_only?O_RDONLY:(O_RDWR|O_CREAT), 0644); if (!posix_lock_tdb) { DEBUG(0,("Failed to open POSIX byte range locking database.\n")); return False; } if (!posix_pending_close_tdb) - posix_pending_close_tdb = tdb_open(NULL, 0, TDB_INTERNAL, + posix_pending_close_tdb = tdb_open_log(NULL, 0, TDB_INTERNAL, read_only?O_RDONLY:(O_RDWR|O_CREAT), 0644); if (!posix_pending_close_tdb) { DEBUG(0,("Failed to open POSIX pending close database.\n")); diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c index 2e404a7eb0..07b1cab583 100644 --- a/source3/nsswitch/winbindd_cache.c +++ b/source3/nsswitch/winbindd_cache.c @@ -39,7 +39,7 @@ void winbindd_cache_init(void) { /* Open tdb cache */ - if (!(cache_tdb = tdb_open(lock_path("winbindd_cache.tdb"), 0, + if (!(cache_tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 0, TDB_NOLOCK, O_RDWR | O_CREAT | O_TRUNC, 0600))) { DEBUG(0, ("Unable to open tdb cache - user and group caching " diff --git a/source3/nsswitch/winbindd_idmap.c b/source3/nsswitch/winbindd_idmap.c index 2bb942396b..73d24f19f6 100644 --- a/source3/nsswitch/winbindd_idmap.c +++ b/source3/nsswitch/winbindd_idmap.c @@ -215,7 +215,7 @@ BOOL winbindd_idmap_init(void) { /* Open tdb cache */ - if (!(idmap_tdb = tdb_open(lock_path("winbindd_idmap.tdb"), 0, + if (!(idmap_tdb = tdb_open_log(lock_path("winbindd_idmap.tdb"), 0, TDB_NOLOCK, O_RDWR | O_CREAT, 0600))) { DEBUG(0, ("Unable to open idmap database\n")); return False; diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c index dc80c6250b..0816ac9a99 100644 --- a/source3/passdb/pdb_tdb.c +++ b/source3/passdb/pdb_tdb.c @@ -344,10 +344,10 @@ BOOL pdb_setsampwent(BOOL update) pstrcat (tdbfile, PASSDB_FILE_NAME); /* Open tdb passwd */ - if (!(global_tdb_ent.passwd_tdb = tdb_open(tdbfile, 0, 0, update ? O_RDWR : O_RDONLY, 0600))) + if (!(global_tdb_ent.passwd_tdb = tdb_open_log(tdbfile, 0, 0, update ? O_RDWR : O_RDONLY, 0600))) { DEBUG(0, ("Unable to open TDB passwd, trying create new!\n")); - if (!(global_tdb_ent.passwd_tdb = tdb_open(tdbfile, 0, 0, O_RDWR | O_CREAT | O_EXCL, 0600))) + if (!(global_tdb_ent.passwd_tdb = tdb_open_log(tdbfile, 0, 0, O_RDWR | O_CREAT | O_EXCL, 0600))) { DEBUG(0, ("Unable to create TDB passwd (passdb.tdb) !!!")); return False; @@ -476,7 +476,7 @@ BOOL pdb_getsampwnam (SAM_ACCOUNT *user, char *sname) key.dsize = strlen (keystr) + 1; /* open the accounts TDB */ - if (!(pwd_tdb = tdb_open(tdbfile, 0, 0, O_RDONLY, 0600))) + if (!(pwd_tdb = tdb_open_log(tdbfile, 0, 0, O_RDONLY, 0600))) { DEBUG(0, ("pdb_getsampwnam: Unable to open TDB passwd!\n")); return False; @@ -577,7 +577,7 @@ BOOL pdb_getsampwrid (SAM_ACCOUNT *user, uint32 rid) key.dsize = strlen (keystr) + 1; /* open the accounts TDB */ - if (!(pwd_tdb = tdb_open(tdbfile, 0, 0, O_RDONLY, 0600))) + if (!(pwd_tdb = tdb_open_log(tdbfile, 0, 0, O_RDONLY, 0600))) { DEBUG(0, ("pdb_getsampwrid: Unable to open TDB rid database!\n")); return False; @@ -622,7 +622,7 @@ BOOL pdb_delete_sam_account(char *sname) pstrcat (tdbfile, PASSDB_FILE_NAME); /* open the TDB */ - if (!(pwd_tdb = tdb_open(tdbfile, 0, 0, O_RDWR, 0600))) + if (!(pwd_tdb = tdb_open_log(tdbfile, 0, 0, O_RDWR, 0600))) { DEBUG(0, ("Unable to open TDB passwd!")); return False; @@ -744,13 +744,13 @@ static BOOL tdb_update_sam(SAM_ACCOUNT* newpwd, BOOL override, int flag) } /* open the account TDB passwd*/ - if (!(pwd_tdb = tdb_open(tdbfile, 0, 0, O_RDWR, 0600))) + if (!(pwd_tdb = tdb_open_log(tdbfile, 0, 0, O_RDWR, 0600))) { DEBUG(0, ("tdb_update_sam: Unable to open TDB passwd!\n")); if (flag == TDB_INSERT) { DEBUG(0, ("Unable to open TDB passwd, trying create new!\n")); - if (!(pwd_tdb = tdb_open(tdbfile, 0, 0, O_RDWR | O_CREAT | O_EXCL, 0600))) + if (!(pwd_tdb = tdb_open_log(tdbfile, 0, 0, O_RDWR | O_CREAT | O_EXCL, 0600))) { DEBUG(0, ("Unable to create TDB passwd (passdb.tdb) !!!\n")); return False; diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c index a3b49cd591..7c65da0264 100644 --- a/source3/passdb/secrets.c +++ b/source3/passdb/secrets.c @@ -36,7 +36,7 @@ BOOL secrets_init(void) pstrcpy(fname, lp_private_dir()); pstrcat(fname,"/secrets.tdb"); - tdb = tdb_open(fname, 0, 0, O_RDWR|O_CREAT, 0600); + tdb = tdb_open_log(fname, 0, 0, O_RDWR|O_CREAT, 0600); if (!tdb) { DEBUG(0,("Failed to open %s\n", fname)); diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index a0031ae35a..11d0cfbdd5 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -180,7 +180,7 @@ BOOL nt_printing_init(void) char *vstring = "INFO/version"; if (tdb && local_pid == sys_getpid()) return True; - tdb = tdb_open(lock_path("ntdrivers.tdb"), 0, 0, O_RDWR|O_CREAT, 0600); + tdb = tdb_open_log(lock_path("ntdrivers.tdb"), 0, 0, O_RDWR|O_CREAT, 0600); if (!tdb) { DEBUG(0,("Failed to open nt drivers database %s (%s)\n", lock_path("ntdrivers.tdb"), strerror(errno) )); diff --git a/source3/printing/printing.c b/source3/printing/printing.c index d98c7c4d4c..5fd2fc5680 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -55,7 +55,7 @@ BOOL print_backend_init(void) char *sversion = "INFO/version"; if (tdb && local_pid == sys_getpid()) return True; - tdb = tdb_open(lock_path("printing.tdb"), 0, 0, O_RDWR|O_CREAT, 0600); + tdb = tdb_open_log(lock_path("printing.tdb"), 0, 0, O_RDWR|O_CREAT, 0600); if (!tdb) { DEBUG(0,("print_backend_init: Failed to open printing backend database. Error = [%s]\n", tdb_errorstr(tdb))); diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index 93c3e18ca7..13d27788e0 100644 --- a/source3/rpc_server/srv_srvsvc_nt.c +++ b/source3/rpc_server/srv_srvsvc_nt.c @@ -125,7 +125,7 @@ BOOL share_info_db_init(void) char *vstring = "INFO/version"; if (share_tdb && local_pid == sys_getpid()) return True; - share_tdb = tdb_open(lock_path("share_info.tdb"), 0, 0, O_RDWR|O_CREAT, 0600); + share_tdb = tdb_open_log(lock_path("share_info.tdb"), 0, 0, O_RDWR|O_CREAT, 0600); if (!share_tdb) { DEBUG(0,("Failed to open share info database %s (%s)\n", lock_path("share_info.tdb"), strerror(errno) )); diff --git a/source3/smbd/session.c b/source3/smbd/session.c index 40654c0f43..8f6907c537 100644 --- a/source3/smbd/session.c +++ b/source3/smbd/session.c @@ -62,7 +62,7 @@ BOOL session_claim(uint16 vuid) } if (!tdb) { - tdb = tdb_open(lock_path("sessionid.tdb"), 0, TDB_CLEAR_IF_FIRST, + tdb = tdb_open_log(lock_path("sessionid.tdb"), 0, TDB_CLEAR_IF_FIRST, O_RDWR | O_CREAT, 0644); if (!tdb) { DEBUG(1,("session_claim: failed to open sessionid tdb\n")); diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c index b940b4006a..843d56234b 100644 --- a/source3/utils/smbcontrol.c +++ b/source3/utils/smbcontrol.c @@ -130,7 +130,7 @@ static BOOL send_message(char *dest, int msg_type, void *buf, int len, BOOL dupl TDB_CONTEXT *tdb; BOOL ret; - tdb = tdb_open(lock_path("connections.tdb"), 0, 0, O_RDONLY, 0); + tdb = tdb_open_log(lock_path("connections.tdb"), 0, 0, O_RDONLY, 0); if (!tdb) { fprintf(stderr,"Failed to open connections database in send_message.\n"); return False; diff --git a/source3/utils/status.c b/source3/utils/status.c index 55c3c1bad1..e695e7572f 100644 --- a/source3/utils/status.c +++ b/source3/utils/status.c @@ -310,7 +310,7 @@ static int traverse_fn1(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void *st return profile_dump(); } - tdb = tdb_open(lock_path("connections.tdb"), 0, 0, O_RDONLY, 0); + tdb = tdb_open_log(lock_path("connections.tdb"), 0, 0, O_RDONLY, 0); if (!tdb) { printf("connections.tdb not initialised\n"); if (!lp_status(-1)) diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c index 51f2e8f00e..f3b07425b7 100644 --- a/source3/web/statuspage.c +++ b/source3/web/statuspage.c @@ -187,7 +187,7 @@ void status_page(void) refresh_interval = atoi(v); } - tdb = tdb_open(lock_path("connections.tdb"), 0, 0, O_RDONLY, 0); + tdb = tdb_open_log(lock_path("connections.tdb"), 0, 0, O_RDONLY, 0); if (tdb) tdb_traverse(tdb, traverse_fn1, NULL); printf("

Server Status

\n"); -- cgit