summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorRichard Sharpe <sharpe@samba.org>2002-12-10 21:29:03 +0000
committerRichard Sharpe <sharpe@samba.org>2002-12-10 21:29:03 +0000
commit117589526fe4022fb587c32dd4a992c9b34e450d (patch)
tree5aab090c8809900497b31de620be90cd412931eb /source3
parentc12b8d89e38ba253dba156ed138d7d6711c24fa7 (diff)
downloadsamba-117589526fe4022fb587c32dd4a992c9b34e450d.tar.gz
samba-117589526fe4022fb587c32dd4a992c9b34e450d.tar.bz2
samba-117589526fe4022fb587c32dd4a992c9b34e450d.zip
Add support to Makefile.in for editreg
Fix a couple of duplicated macros. (This used to be commit 5273844a748230f710d860e33bdcde1c0b1e6c6f)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in7
-rw-r--r--source3/utils/editreg.c3
2 files changed, 6 insertions, 4 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8a12a5200e..7fa27a24cd 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -111,7 +111,8 @@ BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \
BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/smbtree@EXEEXT@ bin/tdbbackup@EXEEXT@ \
bin/nmblookup@EXEEXT@ bin/pdbedit@EXEEXT@
BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/rpcclient@EXEEXT@ bin/smbcacls@EXEEXT@ \
- bin/profiles@EXEEXT@ bin/smbgroupedit@EXEEXT@ bin/ntlm_auth@EXEEXT@
+ bin/profiles@EXEEXT@ bin/smbgroupedit@EXEEXT@ bin/ntlm_auth@EXEEXT@ \
+ bin/editreg@EXEEXT@
TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \
bin/masktest@EXEEXT@ bin/locktest@EXEEXT@ \
@@ -692,6 +693,10 @@ bin/profiles@EXEEXT@: utils/profiles.o bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ utils/profiles.o $(LDFLAGS) $(LIBS)
+bin/editreg@EXEEXT@: utils/editreg.o bin/.dummy
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ utils/editreg.o $(LDFLAGS) $(LIBS)
+
bin/smbspool@EXEEXT@: $(CUPS_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(LDFLAGS) $(LIBS)
diff --git a/source3/utils/editreg.c b/source3/utils/editreg.c
index 2bebee7ef8..1e9a52c012 100644
--- a/source3/utils/editreg.c
+++ b/source3/utils/editreg.c
@@ -655,9 +655,6 @@ typedef struct sk_struct {
char sec_desc[1];
} SK_HDR;
-#define OFF(f) ((f) + 0x1000 + 4)
-#define LOCN(base, f) ((base) + OFF(f))
-
typedef struct hash_struct {
DWORD nk_off;
char hash[4];