afpd.passwd -> afppasswd, make fixes for afppasswd

diff --git a/bin/afppasswd/Makefile.am b/bin/afppasswd/Makefile.am
index d83674fc0226c062d328590f2b27e01a79a2cb09..a653f2f6fdff62b3a49ef35f1c6a16d63a501e23 100644 (file)
--- a/bin/afppasswd/Makefile.am
+++ b/bin/afppasswd/Makefile.am
@@ -5,4 +5,6 @@ bin_PROGRAMS = afppasswd
 afppasswd_SOURCES = afppasswd.c
 afppasswd_LDADD = $(top_srcdir)/libatalk/libatalk.a
 
-CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys \
+       -DUAM_RNDNUM \
+       -D_PATH_AFPDPWFILE=\"$(CONFIG_DIR)/afppasswd\"

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 50d75bc645ad0b6978b1d6ea6c441552d516130f..9c8fe51d4efe4ccd0469909c713327cf668ba629 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -12,7 +12,7 @@ noinst_HEADERS = auth.h codepage.h afp_config.h desktop.h directory.h file.h fil
 CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys \
         -D_PATH_AFPDDEFVOL=\"$(CONFIG_DIR)/AppleVolumes.default\" \
         -D_PATH_AFPDSYSVOL=\"$(CONFIG_DIR)/AppleVolumes.system\" \
-        -D_PATH_AFPDPWFILE=\"$(CONFIG_DIR)/afpd.passwd\" \
+        -D_PATH_AFPDPWFILE=\"$(CONFIG_DIR)/afppasswd\" \
         -D_PATH_AFPDCONF=\"$(CONFIG_DIR)/afpd.conf\" \
         -D_PATH_AFPDUAMPATH=\"$(UAMS_PATH)/\" \
         -D_PATH_AFPDNLSPATH=\"$(CONFIG_DIR)/nls/\" \