X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=etc%2Fafpd%2Fafp_options.c;h=256c91a56676a535c4e428ff9f16b23f117d3317;hb=30bdec7c3396de87144d5f6d45f11ffa6dad116b;hp=e79fc4f227928209ed140a4613f3825944551680;hpb=2fdd522410f80afcd055d7333f491ee6c0b4b9fa;p=netatalk.git

diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index e79fc4f2..256c91a5 100644
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -142,6 +142,8 @@ void afp_options_free(struct afp_options *opt,
 	free(opt->logconfig);
 	if (opt->mimicmodel && (opt->mimicmodel != save->mimicmodel))
 	free(opt->mimicmodel);
+	if (opt->adminauthuser && (opt->adminauthuser != save->adminauthuser))
+	free(opt->adminauthuser);
 }
 
 /* initialize options */
@@ -194,6 +196,7 @@ void afp_options_init(struct afp_options *options)
     options->dsireadbuf = 12;
 	options->mimicmodel = NULL;
     options->fce_fmodwait = 60; /* put fmod events 60 seconds on hold */
+    options->adminauthuser = NULL;
 }
 
 /* parse an afpd.conf line. i'm doing it this way because it's
@@ -507,6 +510,9 @@ int afp_options_parseline(char *buf, struct afp_options *options)
     if ((c = getoption(buf, "-mimicmodel")) && (opt = strdup(c)))
        options->mimicmodel = opt;
 
+    if ((c = getoption(buf, "-adminauthuser")) && (opt = strdup(c)))
+       options->adminauthuser = opt;
+
     return 1;
 }
 
@@ -620,6 +626,9 @@ static void show_version_extended(void )
 	puts( "No" );
 #endif
 
+	printf( "            EA support:\t" );
+	puts( EA_MODULES );
+
 	printf( "           ACL support:\t" );
 #ifdef HAVE_ACLS
 	puts( "Yes" );
@@ -627,9 +636,6 @@ static void show_version_extended(void )
 	puts( "No" );
 #endif
 
-	printf( "            EA support:\t" );
-	puts( EA_MODULES );
-
 	printf( "          LDAP support:\t" );
 #ifdef HAVE_LDAP
 	puts( "Yes" );