X-Git-Url: https://git.piment-noir.org/?p=deb_shairplay.git;a=blobdiff_plain;f=debian%2Fpatches%2Fread_airportkey_from_etc.patch;fp=debian%2Fpatches%2Fread_airportkey_from_etc.patch;h=8b3f33df3b70d3b13b9c99e59138d92da7b43e04;hp=80d4d17b91755d5c5007231fa34b2479a2eed6c3;hb=e11d53a834240787ecff395da0b573358b0aa584;hpb=e2e3f886d1d84f5ed217c1e9c09864f3e48ad2d1

diff --git a/debian/patches/read_airportkey_from_etc.patch b/debian/patches/read_airportkey_from_etc.patch
index 80d4d17..8b3f33d 100644
--- a/debian/patches/read_airportkey_from_etc.patch
+++ b/debian/patches/read_airportkey_from_etc.patch
@@ -1,16 +1,15 @@
---- shairplay-0.9.0.orig/src/shairplay.c
-+++ shairplay-0.9.0/src/shairplay.c
-@@ -313,8 +313,11 @@ main(int argc, char *argv[])
+--- a/src/shairplay.c
++++ b/src/shairplay.c
+@@ -346,10 +346,10 @@
+ 	raop_cbs.audio_destroy = audio_destroy;
+ 	raop_cbs.audio_set_volume = audio_set_volume;
  
- 	raop = raop_init_from_keyfile(10, &raop_cbs, "airport.key", NULL);
+-	raop = raop_init_from_keyfile(10, &raop_cbs, "airport.key", NULL);
++	raop = raop_init_from_keyfile(10, &raop_cbs, "/etc/shairplay/airport.key", NULL);
  	if (raop == NULL) {
--		fprintf(stderr, "Could not initialize the RAOP service\n");
--		return -1;
-+		raop = raop_init_from_keyfile(10, &raop_cbs, "/etc/shairplay/airport.key", NULL);
-+		if (raop == NULL) {
-+			fprintf(stderr, "Could not initialize the RAOP service\n");
-+			return -1;
-+		}
+ 		fprintf(stderr, "Could not initialize the RAOP service\n");
+-		fprintf(stderr, "Please make sure the airport.key file is in the current directory.\n");
++		fprintf(stderr, "Please make sure the /etc/shairplay/airport.key file is in the current directory.\n");
+ 		return -1;
  	}
  
- 	if (strlen(options.password)) {