From 117589526fe4022fb587c32dd4a992c9b34e450d Mon Sep 17 00:00:00 2001
From: Richard Sharpe <sharpe@samba.org>
Date: Tue, 10 Dec 2002 21:29:03 +0000
Subject: [PATCH] Add support to Makefile.in for editreg

Fix a couple of duplicated macros.
(This used to be commit 5273844a748230f710d860e33bdcde1c0b1e6c6f)
---
 source3/Makefile.in     | 7 ++++++-
 source3/utils/editreg.c | 3 ---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8a12a5200e1..7fa27a24cd5 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 2bebee7ef83..1e9a52c012c 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];
-- 
2.11.4.GIT