summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-08-10 01:25:32 +0000
committerAndrew Tridgell <tridge@samba.org>1998-08-10 01:25:32 +0000
commit65a29b0ca56a78148b415fd817af245afc2bb0b9 (patch)
tree6d1cf84b352f5d35bab0059144a402778afeb678
parent59e2e2c7d8df317c17b860a4f924c791e8dbbca8 (diff)
downloadsamba-65a29b0ca56a78148b415fd817af245afc2bb0b9.tar.gz
samba-65a29b0ca56a78148b415fd817af245afc2bb0b9.tar.bz2
samba-65a29b0ca56a78148b415fd817af245afc2bb0b9.zip
the rest of the binaries now compile and link
(This used to be commit 7fecc3d5a2fb641237f24a3f39c6556fde648a8a)
-rw-r--r--source3/Makefile.in58
-rw-r--r--source3/utils/status.c67
2 files changed, 68 insertions, 57 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index e1e1aea517..b5816c4c39 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -157,15 +157,30 @@ SWAT_OBJ = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
SMBRUN_OBJ = utils/smbrun.o
+MAKE_SMBCODEPAGE_OBJ = utils/make_smbcodepage.o $(PARAM_OBJ) $(PASSDB_OBJ) \
+ $(UBIQX_OBJ) $(LIB_OBJ)
+
+MAKE_PRINTERDEF_OBJ = utils/make_printerdef.o $(PARAM_OBJ) $(PASSDB_OBJ) \
+ $(UBIQX_OBJ) $(LIB_OBJ)
+
+STATUS_OBJ = utils/status.o $(LOCKING_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) \
+ $(UBIQX_OBJ) $(LIB_OBJ)
+
TESTPARM_OBJ = utils/testparm.o smbd/access.o $(PARAM_OBJ) $(PASSDB_OBJ) \
$(UBIQX_OBJ) $(LIB_OBJ)
TESTPRNS_OBJ = utils/testprns.o $(PARAM_OBJ) $(UBIQX_OBJ) $(PASSDB_OBJ) \
$(LIB_OBJ)
+SMBPASSWD_OBJ = utils/smbpasswd.o $(PARAM_OBJ) $(PASSDB_OBJ) $(LIBSMB_OBJ) \
+ $(UBIQX_OBJ) $(RPC_CLIENT_OBJ) $(RPC_PARSE_OBJ) $(LIB_OBJ)
+
CLIENT_OBJ = client/client.o client/clientutil.o client/clitar.o \
$(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(PASSDB_OBJ) $(LIB_OBJ)
+NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(PASSDB_OBJ) $(UBIQX_OBJ) \
+ $(LIBSMB_OBJ) $(LIB_OBJ)
+
PROTO_OBJ = $(SMBD_OBJ) $(NMBD_OBJ) $(SWAT_OBJ) $(CLIENT_OBJ)
######################################################################
@@ -209,10 +224,26 @@ bin/testprns: $(TESTPRNS_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(TESTPRNS_OBJ) $(LIBS)
+bin/smbstatus: $(STATUS_OBJ)
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LIBS)
+
+bin/smbpasswd: $(SMBPASSWD_OBJ)
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(LIBS)
+
+bin/make_smbcodepage: $(MAKE_SMBCODEPAGE_OBJ)
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(MAKE_SMBCODEPAGE_OBJ) $(LIBS)
+
+bin/nmblookup: $(NMBLOOKUP_OBJ)
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LIBS)
+
+bin/make_printerdef: $(MAKE_PRINTERDEF_OBJ)
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(MAKE_PRINTERDEF_OBJ) $(LIBS)
-nmblookup: $(LOOKUP_OBJ)
- @echo Linking nmblookup
- @$(CC) $(FLAGS) -o nmblookup $(LOOKUP_OBJ) $(LIBS)
smbmount: $(MOUNT_OBJ)
@echo Linking smbmount
@@ -230,27 +261,6 @@ smbtorture: torture.o getsmbpass.o $(UTILOBJ) $(CLIENTUTIL)
@echo Linking smbtorture
@$(CC) $(FLAGS) -o smbtorture torture.o getsmbpass.o $(UTILOBJ) $(CLIENTUTIL) $(LIBS)
-smbstatus: $(STATUS_OBJ)
- @echo Linking smbstatus
- @$(CC) $(FLAGS) -o smbstatus $(STATUS_OBJ) $(LIBS)
-
-smbpasswd: smbpasswd.o getsmbpass.o $(PASSDB_OBJ) $(UTILOBJ) $(CLIENTUTIL) $(RPC_CLIENT_SERVER_SUBSET_OBJ) $(RPC_OBJ)
- @echo Linking smbpasswd
- @$(CC) $(FLAGS) -o smbpasswd smbpasswd.o getsmbpass.o $(PASSDB_OBJ) $(UTILOBJ) $(CLIENTUTIL) \
- $(RPC_CLIENT_SERVER_SUBSET_OBJ) $(RPC_OBJ) $(LIBS)
-
-make_smbcodepage: make_smbcodepage.o $(UTILOBJ)
- @echo Linking make_smbcodepage
- @$(CC) $(FLAGS) -o make_smbcodepage make_smbcodepage.o $(UTILOBJ) $(LIBS)
-
-make_printerdef: make_printerdef.o $(UTILOBJ)
- @echo Linking make_printerdef
- @$(CC) $(FLAGS) -o make_printerdef make_printerdef.o $(UTILOBJ) $(LIBS)
-
-wsmbstatus: wsmbstatus.o $(UTILOBJ)
- @echo Linking wsmbstatus
- @$(CC) $(FLAGS) -o wsmbstatus wsmbstatus.o $(UTILOBJ) $(LIBS)
-
install: installbin installman installscripts installcp installswat
installbin: all
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 8ece6ed4c1..225f1712fe 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -66,6 +66,40 @@ files_struct Files[MAX_OPEN_FILES];
struct current_user current_user;
+/* added by OH */
+static void Ucrit_addUsername(char *username)
+{
+ pstrcpy(Ucrit_username, username);
+ if(strlen(Ucrit_username) > 0)
+ Ucrit_IsActive = 1;
+}
+
+static unsigned int Ucrit_checkUsername(char *username)
+{
+ if ( !Ucrit_IsActive) return 1;
+ if (strcmp(Ucrit_username,username) ==0) return 1;
+ return 0;
+}
+
+static void Ucrit_addPid(int pid)
+{
+ int i;
+ if ( !Ucrit_IsActive) return;
+ for (i=0;i<Ucrit_MaxPid;i++)
+ if( pid == Ucrit_pid[i] ) return;
+ Ucrit_pid[Ucrit_MaxPid++] = pid;
+}
+
+static unsigned int Ucrit_checkPid(int pid)
+{
+ int i;
+ if ( !Ucrit_IsActive) return 1;
+ for (i=0;i<Ucrit_MaxPid;i++)
+ if( pid == Ucrit_pid[i] ) return 1;
+ return 0;
+}
+
+
static void print_share_mode(share_mode_entry *e, char *fname)
{
static int count;
@@ -296,36 +330,3 @@ static void print_share_mode(share_mode_entry *e, char *fname)
return (0);
}
-/* added by OH */
-void Ucrit_addUsername(pstring username)
-{
- pstrcpy(Ucrit_username, username);
- if(strlen(Ucrit_username) > 0)
- Ucrit_IsActive = 1;
-}
-
-unsigned int Ucrit_checkUsername(pstring username)
-{
- if ( !Ucrit_IsActive) return 1;
- if (strcmp(Ucrit_username,username) ==0) return 1;
- return 0;
-}
-
-void Ucrit_addPid(int pid)
-{
- int i;
- if ( !Ucrit_IsActive) return;
- for (i=0;i<Ucrit_MaxPid;i++)
- if( pid == Ucrit_pid[i] ) return;
- Ucrit_pid[Ucrit_MaxPid++] = pid;
-}
-
-unsigned int Ucrit_checkPid(int pid)
-{
- int i;
- if ( !Ucrit_IsActive) return 1;
- for (i=0;i<Ucrit_MaxPid;i++)
- if( pid == Ucrit_pid[i] ) return 1;
- return 0;
-}
-