diff options
| author | Jeremy Allison <jra@samba.org> | 2002-01-02 21:54:38 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-01-02 21:54:38 +0000 |
| commit | bf8e91e3625fd950218f07ef5bc0d08e09b38a1f (patch) | |
| tree | cc88dadf18057bec540732b5bbbdfcb0675fa87d | |
| parent | ed51782f835bc6e083e06cfff0c3ad063bd8d8d2 (diff) | |
| download | samba-bf8e91e3625fd950218f07ef5bc0d08e09b38a1f.tar.gz samba-bf8e91e3625fd950218f07ef5bc0d08e09b38a1f.tar.bz2 samba-bf8e91e3625fd950218f07ef5bc0d08e09b38a1f.zip | |
We should be SHLD not LINK when creating shared libraries.
Tidyup in passdb.c
Jeremy.
(This used to be commit 676eea502a1bb2114a6e8055ecaf97ecab2e3a91)
| -rw-r--r-- | source3/Makefile.in | 14 | ||||
| -rw-r--r-- | source3/passdb/passdb.c | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index eb2cabf623..0beecd2d1f 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -676,11 +676,11 @@ bin/smbw_sample: $(SMBW_OBJ) utils/smbw_sample.o bin/.dummy bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) @echo Linking shared library $@ - @$(LINK) $(LDSHFLAGS) -o $@ $(PICOBJS) $(LIBS) + @$(SHLD) $(LDSHFLAGS) -o $@ $(PICOBJS) $(LIBS) bin/smbwrapper.32.@SHLIBEXT@: $(PICOBJS32) @echo Linking shared library $@ - @$(LINK) -32 $(LDSHFLAGS) -o $@ $(PICOBJS32) $(LIBS) + @$(SHLD) -32 $(LDSHFLAGS) -o $@ $(PICOBJS32) $(LIBS) bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS) echo Linking libsmbclient shared library $@ @@ -694,11 +694,11 @@ libsmbclient: bin/libsmbclient.a @LIBSMBCLIENT_SHARED@ bin/smbsh: $(SMBSH_OBJ) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(SMBSH_OBJ) $(LDFLAGS) $(LIBS) + @$(SHLD) $(FLAGS) -o $@ $(SMBSH_OBJ) $(LDFLAGS) $(LIBS) nsswitch/libnss_wins.so: $(NSS_OBJ) @echo "Linking $@" - @$(LINK) $(LDSHFLAGS) -o $@ $(NSS_OBJ) -lc + @$(SHLD) $(LDSHFLAGS) -o $@ $(NSS_OBJ) -lc bin/winbindd: $(WINBINDD_OBJ) bin/.dummy @echo Linking $@ @@ -706,11 +706,11 @@ bin/winbindd: $(WINBINDD_OBJ) bin/.dummy nsswitch/libnss_winbind.so: $(WINBIND_NSS_PICOBJS) @echo "Linking $@" - @$(LINK) $(LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) + @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) nsswitch/pam_winbind.so: $(PAM_WINBIND_OBJ) bin/.dummy @echo Linking $@ - @$(LINK) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) + @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) bin/wbinfo: $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) \ $(UBIQX_OBJ) @BUILD_POPT@ bin/.dummy @@ -720,7 +720,7 @@ bin/wbinfo: $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) \ bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_PICOOBJ) @echo "Linking shared library $@" - $(LINK) $(LDSHFLAGS) -symbolic -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(LIBS) -lc + $(SHLD) $(LDSHFLAGS) -symbolic -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(LIBS) -lc bin/libmsrpc.a: $(LIBMSRPC_PICOBJ) -$(AR) -rc $@ $(LIBMSRPC_PICOBJ) diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 53f3c231a1..fe7e6a2f41 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -1766,7 +1766,7 @@ BOOL pdb_set_nt_passwd (SAM_ACCOUNT *sampass, const uint8 *pwd) if (!sampass) return False; - data_blob_clear_free(&(sampass->private.nt_pw)); + data_blob_clear_free(&sampass->private.nt_pw); sampass->private.nt_pw = data_blob(pwd, NT_HASH_LEN); @@ -1782,7 +1782,7 @@ BOOL pdb_set_lanman_passwd (SAM_ACCOUNT *sampass, const uint8 *pwd) if (!sampass) return False; - data_blob_clear_free(&(sampass->private.lm_pw)); + data_blob_clear_free(&sampass->private.lm_pw); sampass->private.lm_pw = data_blob(pwd, LM_HASH_LEN); |