diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2013-02-18 10:18:40 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2013-02-18 10:18:40 +0000 |
| commit | c9dd09ab32087f97dfd1228f81b4d06cda4cbc29 (patch) | |
| tree | e7f3fe03d4ec991ae4e6c25ef17d93453da89839 /usr.sbin/nsd/nsd.c | |
| parent | b0c1602e0968a3f81c378c5c32d38eaa302845c5 (diff) | |
resolve conflicts
Diffstat (limited to 'usr.sbin/nsd/nsd.c')
| -rw-r--r-- | usr.sbin/nsd/nsd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/nsd/nsd.c b/usr.sbin/nsd/nsd.c index 8599c01db3c..6414dc43f49 100644 --- a/usr.sbin/nsd/nsd.c +++ b/usr.sbin/nsd/nsd.c @@ -465,7 +465,7 @@ main(int argc, char *argv[]) struct sigaction action; FILE* dbfd; #ifdef HAVE_GETPWNAM - struct passwd *pwd; + struct passwd *pwd = NULL; #endif /* HAVE_GETPWNAM */ /* For initialising the address info structures */ |