diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2009-06-26 16:52:10 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2009-06-26 16:52:10 +0000 |
| commit | 63495589aec724590bfb9245a310d68cb49fb88f (patch) | |
| tree | bf1f90a61dda0672bb484e3a499167ea3959f40d /nslcd | |
| parent | 9a521064d7aa6033b0d7342d467324a495cdcdf3 (diff) | |
merge r951 from trunk
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@952 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd')
| -rw-r--r-- | nslcd/cfg.c | 3 | ||||
| -rw-r--r-- | nslcd/nslcd.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nslcd/cfg.c b/nslcd/cfg.c index d7fde81..9051e68 100644 --- a/nslcd/cfg.c +++ b/nslcd/cfg.c @@ -849,7 +849,8 @@ static void cfg_read(const char *filename,struct ldap_config *cfg) { check_argumentcount(filename,lnr,keyword, (get_token(&line,token,sizeof(token))!=NULL)); - if (strcasecmp(token,"start_tls")==0) + if ( (strcasecmp(token,"start_tls")==0) || + (strcasecmp(token,"starttls")==0) ) cfg->ldc_ssl_on=SSL_START_TLS; else if (parse_boolean(filename,lnr,token)) cfg->ldc_ssl_on=SSL_LDAPS; diff --git a/nslcd/nslcd.c b/nslcd/nslcd.c index 8c64c9c..d95c09f 100644 --- a/nslcd/nslcd.c +++ b/nslcd/nslcd.c @@ -474,7 +474,7 @@ static void create_pidfile(const char *filename) { if ((fp=fopen(filename,"w"))==NULL) { - log_log(LOG_ERR,"cannot open pid file (%s): %s",filename,strerror(errno)); + log_log(LOG_ERR,"cannot create pid file (%s): %s",filename,strerror(errno)); exit(EXIT_FAILURE); } if (fprintf(fp,"%d\n",(int)getpid())<=0) |