diff options
Diffstat (limited to 'nss/nsswitch.c')
| -rw-r--r-- | nss/nsswitch.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nss/nsswitch.c b/nss/nsswitch.c index bb644cb373..d7706506f0 100644 --- a/nss/nsswitch.c +++ b/nss/nsswitch.c @@ -712,6 +712,9 @@ nss_parse_service_list (const char *line) else if (line - name == 8 && __strncasecmp (name, "CONTINUE", 8) == 0) action = NSS_ACTION_CONTINUE; + else if (line - name == 5 + && __strncasecmp (name, "MERGE", 5) == 0) + action = NSS_ACTION_MERGE; else goto finish; |