]> git.ipfire.org Git - thirdparty/sarg.git/commitdiff
Merge messages about IP addresses.
authorFrederic Marchal <fmarchal@users.sourceforge.net>
Sun, 26 Apr 2015 12:00:36 +0000 (14:00 +0200)
committerFrederic Marchal <fmarchal@users.sourceforge.net>
Sun, 26 Apr 2015 12:00:36 +0000 (14:00 +0200)
ip2name.c
ip2name_exec.c

index f201f5f348cf9cb83fd37ce3eb37061bfcf25dca..48bf8062c289556f4714924681acf1aab8d87057 100644 (file)
--- a/ip2name.c
+++ b/ip2name.c
@@ -320,7 +320,7 @@ void name2ip(char *name,int name_size)
        getword_start(&gwarea,inet_ntoa(ia));
        if (getword(n4,sizeof(n4),&gwarea,'.')<0 || getword(n3,sizeof(n3),&gwarea,'.')<0 ||
            getword(n2,sizeof(n2),&gwarea,'.')<0 || getword(n1,sizeof(n1),&gwarea,0)<0) {
-               printf("SARG: Maybe you have a broken record or garbage in your %s ip address.\n",gwarea.beginning);
+               debuga(_("Invalid IPv4 address \"%s\"\n"),gwarea.beginning);
                exit(EXIT_FAILURE);
        }
        snprintf(name,name_size,"%s.%s.%s.%s",n1,n2,n3,n4);
index 71bbd61bd8656bb7a87e510bfa756be92187e1cb..d68bbaecfce01047bc68edcaa61327648040868f 100644 (file)
@@ -100,7 +100,7 @@ static enum ip2name_retcode ip2name_exec(char *ip,int ip_len)
                        i+=2;
                } else {
                        if (j>=sizeof(cmd)) {
-                               debuga(_("IP address \"%.*s\" too long for the command to run\n"),ip_len,ip);
+                               debuga(_("IP address \"%s\" too long for the command to run\n"),ip);
                                return(INRC_Error);
                        }
                        cmd[j++]=ExecCmd[i];