Refresh the patches list.
[deb_shairplay.git] / debian / patches / read_airportkey_from_etc.patch
index 80d4d17b91755d5c5007231fa34b2479a2eed6c3..8b3f33df3b70d3b13b9c99e59138d92da7b43e04 100644 (file)
@@ -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)) {