X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fshairplay.c;h=9bb9537fd75bdafaee512b0fefa1705815356fbf;hb=093f6e0042a9e1d673052d7dbf35508c3f305bb6;hp=691b24f36f59941117552478dc571c521994970a;hpb=668e175b7b1a9e0c8afdc4e01ddbc9c7ac96fdd2;p=deb_shairplay.git

diff --git a/src/shairplay.c b/src/shairplay.c
index 691b24f..9bb9537 100644
--- a/src/shairplay.c
+++ b/src/shairplay.c
@@ -226,7 +226,8 @@ parse_options(shairplay_options_t *opt, int argc, char *argv[])
 	char *path = argv[0];
 	char *arg;
 
-	strcpy(opt->apname, "Shairplay");
+	/* Set default values for apname and port */
+	strncpy(opt->apname, "Shairplay", sizeof(opt->apname)-1);
 	opt->port = 5000;
 
 	while ((arg = *++argv)) {
@@ -264,13 +265,6 @@ parse_options(shairplay_options_t *opt, int argc, char *argv[])
 		}
 	}
 
-	/* Set default values for apname and port */
-	if (!strlen(opt->apname)) {
-		strncpy(opt->apname, "Shairplay", sizeof(opt->apname)-1);
-	}
-	if (!opt->port) {
-		opt->port = 5000;
-	}
 	return 0;
 }
 
@@ -285,6 +279,7 @@ main(int argc, char *argv[])
 	dnssd_t *dnssd;
 	raop_t *raop;
 	raop_callbacks_t raop_cbs;
+	char *password = NULL;
 
 	int error;
 
@@ -322,8 +317,11 @@ main(int argc, char *argv[])
 		return -1;
 	}
 
+	if (strlen(options.password)) {
+		password = options.password;
+	}
 	raop_set_log_level(raop, RAOP_LOG_DEBUG);
-	raop_start(raop, &options.port, hwaddr, sizeof(hwaddr), NULL);
+	raop_start(raop, &options.port, hwaddr, sizeof(hwaddr), password);
 
 	error = 0;
 	dnssd = dnssd_init(&error);