wsdd2: fix invalid error message 6992/head
authorAndy Walsh <andy.walsh44+github@gmail.com>
Mon, 10 Sep 2018 15:47:32 +0000 (17:47 +0200)
committerAndy Walsh <andy.walsh44+github@gmail.com>
Mon, 10 Sep 2018 15:47:32 +0000 (17:47 +0200)
* fixed invalid error message

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
net/wsdd2/Makefile
net/wsdd2/patches/001-add_uuid_boot_id.patch

index 1cda1ae934bcb82a22c82ab1c786ed28e3489427..7bda797c98a617a0f3bd6369d62ab404ee12d18d 100644 (file)
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wsdd2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/Andy2244/wsdd2.git
index 5f60f221615b9439beeeb7bdb4268f27a05d2938..0c59365a1c07551f59a4bddd2fc9b5bcbe6db942 100644 (file)
@@ -1,16 +1,19 @@
---- a/wsd.c    2018-07-20
-+++ b/wsd.c    2018-07-20
-@@ -97,12 +97,17 @@ static void uuid_endpoint(char *uuid, si
+--- a/wsd.c    2018-07-24
++++ b/wsd.c    2018-09-10
+@@ -96,13 +96,19 @@ static void uuid_endpoint(char *uuid, si
+ {
        FILE *fp = fopen("/etc/machine-id", "r");
        int c, i = 0;
++      
 +      if (!fp) {
-+              DEBUG(0, W, "Can't open '/etc/machine-id', trying '/proc/sys/kernel/random/boot_id'");
 +              fp = fopen("/proc/sys/kernel/random/boot_id", "r");
 +      }
-+              
-       if (!fp)
+-      if (!fp)
++      if (!fp) {
++              DEBUG(0, W, "Can't open required '/etc/machine-id' or '/proc/sys/kernel/random/boot_id'");
                return;
++      }
  
        while (i < 36 && (c = getc(fp)) != EOF &&
 -              (isdigit(c) || (islower(c) && isxdigit(c)))) {