Module Name: src
Committed By: tron
Date: Sat Feb 21 12:00:49 UTC 2015
Modified Files:
src/external/ibm-public/postfix/dist/src/postconf: postconf_master.c
Log Message:
Resolve conflicts from last import.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/dist/src/postconf/postconf_master.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/dist/src/postconf/postconf_master.c
diff -u src/external/ibm-public/postfix/dist/src/postconf/postconf_master.c:1.3 src/external/ibm-public/postfix/dist/src/postconf/postconf_master.c:1.4
--- src/external/ibm-public/postfix/dist/src/postconf/postconf_master.c:1.3 Sun Jul 6 19:45:50 2014
+++ src/external/ibm-public/postfix/dist/src/postconf/postconf_master.c Sat Feb 21 12:00:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: postconf_master.c,v 1.3 2014/07/06 19:45:50 tron Exp $ */
+/* $NetBSD: postconf_master.c,v 1.4 2015/02/21 12:00:48 tron Exp $ */
/*++
/* NAME
@@ -275,7 +275,7 @@ static void pcf_check_master_entry(ARGV
for (field = PCF_MASTER_FLD_PRIVATE; field <= PCF_MASTER_FLD_CHROOT; field++) {
cp = argv->argv[field];
if (cp[1] != 0 || strchr(pcf_valid_bool_types, *cp) == 0)
- pcf_fix_fatal("invalid %s field \%s\" in \"%s\"",
+ pcf_fix_fatal("invalid %s field \"%s\" in \"%s\"",
pcf_str_field_pattern(field), cp, raw_text);
}
@@ -284,12 +284,12 @@ static void pcf_check_master_entry(ARGV
if (len > 0 && cp[len - 1] == '?')
len--;
if (!(cp[0] == '-' && len == 1) && strspn(cp, "0123456789") != len)
- pcf_fix_fatal("invalid " PCF_MASTER_NAME_WAKEUP " field \%s\" in \"%s\"",
+ pcf_fix_fatal("invalid " PCF_MASTER_NAME_WAKEUP " field \"%s\" in \"%s\"",
cp, raw_text);
cp = argv->argv[PCF_MASTER_FLD_MAXPROC];
if (strcmp("-", cp) != 0 && cp[strspn(cp, "0123456789")] != 0)
- pcf_fix_fatal("invalid " PCF_MASTER_NAME_MAXPROC " field \%s\" in \"%s\"",
+ pcf_fix_fatal("invalid " PCF_MASTER_NAME_MAXPROC " field \"%s\" in \"%s\"",
cp, raw_text);
}
