nss-pam-ldapd commit: r1950 - in nss-pam-ldapd-0.8: . nslcd pam pynslcd
[
Date Prev][
Date Next]
[
Thread Prev][
Thread Next]
nss-pam-ldapd commit: r1950 - in nss-pam-ldapd-0.8: . nslcd pam pynslcd
- From: Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>
- To: nss-pam-ldapd-commits [at] lists.arthurdejong.org
- Reply-to: nss-pam-ldapd-users [at] lists.arthurdejong.org
- Subject: nss-pam-ldapd commit: r1950 - in nss-pam-ldapd-0.8: . nslcd pam pynslcd
- Date: Sun, 28 Apr 2013 22:32:30 +0200 (CEST)
Author: arthur
Date: Sun Apr 28 22:32:30 2013
New Revision: 1950
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1950&view=revision
Log:
various typo and other comment fixes (4b01125, b0785de, bfdf7cd, 4689d5f,
dba048b, ebe5705 and 122c38d from 0.9)
Modified:
nss-pam-ldapd-0.8/ (props changed)
nss-pam-ldapd-0.8/nslcd.h
nss-pam-ldapd-0.8/nslcd/cfg.h
nss-pam-ldapd-0.8/nslcd/common.h
nss-pam-ldapd-0.8/nslcd/myldap.c
nss-pam-ldapd-0.8/nslcd/nslcd.c
nss-pam-ldapd-0.8/nslcd/pam.c
nss-pam-ldapd-0.8/nslcd/service.c
nss-pam-ldapd-0.8/pam/pam.c
nss-pam-ldapd-0.8/pynslcd/alias.py
nss-pam-ldapd-0.8/pynslcd/shadow.py
Modified: nss-pam-ldapd-0.8/nslcd.h
==============================================================================
--- nss-pam-ldapd-0.8/nslcd.h Sun Apr 28 22:20:47 2013 (r1949)
+++ nss-pam-ldapd-0.8/nslcd.h Sun Apr 28 22:32:30 2013 (r1950)
@@ -2,7 +2,7 @@
nslcd.h - file describing client/server protocol
Copyright (C) 2006 West Consulting
- Copyright (C) 2006, 2007, 2009, 2010, 2011, 2012 Arthur de Jong
+ Copyright (C) 2006, 2007, 2009, 2010, 2011, 2012, 2013 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -167,7 +167,9 @@
#define NSLCD_ACTION_RPC_BYNUMBER 10002
#define NSLCD_ACTION_RPC_ALL 10003
-/* Service (/etc/services) information requests. Result values are:
+/* Service (/etc/services) information requests. The BYNAME and BYNUMBER
+ requests contain an extra protocol string in the request which, if not
+ blank, will filter the services by this protocol. Result values are:
STRING service name
STRINGLIST service aliases
INT32 service (port) number
Modified: nss-pam-ldapd-0.8/nslcd/cfg.h
==============================================================================
--- nss-pam-ldapd-0.8/nslcd/cfg.h Sun Apr 28 22:20:47 2013 (r1949)
+++ nss-pam-ldapd-0.8/nslcd/cfg.h Sun Apr 28 22:32:30 2013 (r1950)
@@ -5,7 +5,7 @@
Copyright (C) 1997-2005 Luke Howard
Copyright (C) 2007 West Consulting
- Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Arthur de Jong
+ Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -149,7 +149,7 @@
SET *ldc_nss_initgroups_ignoreusers;
/* the searches that should be performed to do autorisation checks */
char *ldc_pam_authz_search[NSS_LDAP_CONFIG_MAX_AUTHZ_SEARCHES];
- /* minimum uid for users retreived from LDAP */
+ /* minimum uid for users retrieved from LDAP */
uid_t ldc_nss_min_uid;
/* the regular expression to determine valid names */
regex_t validnames;
Modified: nss-pam-ldapd-0.8/nslcd/common.h
==============================================================================
--- nss-pam-ldapd-0.8/nslcd/common.h Sun Apr 28 22:20:47 2013 (r1949)
+++ nss-pam-ldapd-0.8/nslcd/common.h Sun Apr 28 22:32:30 2013 (r1950)
@@ -3,7 +3,7 @@
This file is part of the nss-pam-ldapd library.
Copyright (C) 2006 West Consulting
- Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Arthur de Jong
+ Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -121,7 +121,7 @@
requested*/
MYLDAP_ENTRY *shadow_uid2entry(MYLDAP_SESSION *session,const char
*username,int *rcp);
-/* return shadown information */
+/* return shadow information */
void get_shadow_properties(MYLDAP_ENTRY *entry,long *lastchangedate,
long *mindays,long *maxdays,long *warndays,
long *inactdays,long *expiredate,unsigned long
*flag);
Modified: nss-pam-ldapd-0.8/nslcd/myldap.c
==============================================================================
--- nss-pam-ldapd-0.8/nslcd/myldap.c Sun Apr 28 22:20:47 2013 (r1949)
+++ nss-pam-ldapd-0.8/nslcd/myldap.c Sun Apr 28 22:32:30 2013 (r1950)
@@ -5,7 +5,7 @@
Copyright (C) 1997-2006 Luke Howard
Copyright (C) 2006, 2007 West Consulting
- Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Arthur de Jong
+ Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -571,7 +571,7 @@
#ifdef LDAP_OPT_CONNECT_CB
/* This function is called by the LDAP library once a connection was made to
the server. We
- set a timeout on the socket here, to catch netzwork timeouts during the ssl
+ set a timeout on the socket here, to catch network timeouts during the ssl
handshake phase. It is configured with LDAP_OPT_CONNECT_CB. */
static int connect_cb(LDAP *ld,Sockbuf UNUSED(*sb),LDAPURLDesc UNUSED(*srv),
struct sockaddr UNUSED(*addr),struct ldap_conncb UNUSED(*ctx))
@@ -1348,7 +1348,7 @@
/* Get the DN from the entry. This function only returns NULL (and sets
errno) if an incorrect entry is passed. If the DN value cannot be
- retreived "unknown" is returned instead. */
+ retrieved "unknown" is returned instead. */
const char *myldap_get_dn(MYLDAP_ENTRY *entry)
{
int rc;
@@ -1359,7 +1359,7 @@
errno=EINVAL;
return "unknown";
}
- /* if we don't have it yet, retreive it */
+ /* if we don't have it yet, retrieve it */
if ((entry->dn==NULL)&&(entry->search->valid))
{
entry->dn=ldap_get_dn(entry->search->session->ld,entry->search->msg);
Modified: nss-pam-ldapd-0.8/nslcd/nslcd.c
==============================================================================
--- nss-pam-ldapd-0.8/nslcd/nslcd.c Sun Apr 28 22:20:47 2013 (r1949)
+++ nss-pam-ldapd-0.8/nslcd/nslcd.c Sun Apr 28 22:32:30 2013 (r1950)
@@ -340,7 +340,7 @@
log_log(LOG_WARNING,"problem closing socket: %s",strerror(errno));
exit(EXIT_FAILURE);
}
- /* close the file descriptor on exit */
+ /* close the file descriptor on exec */
if (fcntl(sock,F_SETFD,FD_CLOEXEC)<0)
{
log_log(LOG_ERR,"fctnl(F_SETFL,FD_CLOEXEC) on %s failed:
%s",filename,strerror(errno));
Modified: nss-pam-ldapd-0.8/nslcd/pam.c
==============================================================================
--- nss-pam-ldapd-0.8/nslcd/pam.c Sun Apr 28 22:20:47 2013 (r1949)
+++ nss-pam-ldapd-0.8/nslcd/pam.c Sun Apr 28 22:32:30 2013 (r1950)
@@ -2,7 +2,7 @@
pam.c - pam processing routines
Copyright (C) 2009 Howard Chu
- Copyright (C) 2009, 2010, 2011, 2012 Arthur de Jong
+ Copyright (C) 2009, 2010, 2011, 2012, 2013 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -154,7 +154,7 @@
return NSLCD_PAM_SUCCESS; /* no shadow entry found, nothing to check */
/* get today's date */
today=(long)(time(NULL)/(60*60*24));
- /* get shadown information */
+ /* get shadow information */
get_shadow_properties(entry,&lastchangedate,&mindays,&maxdays,&warndays,
&inactdays,&expiredate,&flag);
/* check account expiry date */
Modified: nss-pam-ldapd-0.8/nslcd/service.c
==============================================================================
--- nss-pam-ldapd-0.8/nslcd/service.c Sun Apr 28 22:20:47 2013 (r1949)
+++ nss-pam-ldapd-0.8/nslcd/service.c Sun Apr 28 22:32:30 2013 (r1950)
@@ -154,7 +154,7 @@
/* if the service name is not yet found, get the first entry */
if (name==NULL)
name=aliases[0];
- /* check case of returned servies entry */
+ /* check case of returned services entry */
if ((reqname!=NULL)&&(STR_CMP(reqname,name)!=0))
{
for (i=0;(aliases[i]!=NULL)&&(STR_CMP(reqname,aliases[i])!=0);i++)
Modified: nss-pam-ldapd-0.8/pam/pam.c
==============================================================================
--- nss-pam-ldapd-0.8/pam/pam.c Sun Apr 28 22:20:47 2013 (r1949)
+++ nss-pam-ldapd-0.8/pam/pam.c Sun Apr 28 22:32:30 2013 (r1950)
@@ -2,7 +2,7 @@
pam.c - pam module functions
Copyright (C) 2009 Howard Chu
- Copyright (C) 2009, 2010, 2011, 2012 Arthur de Jong
+ Copyright (C) 2009, 2010, 2011, 2012, 2013 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -655,7 +655,7 @@
pam_syslog(pamh,LOG_NOTICE,"%s;
user=%s",pam_strerror(pamh,ctx->authok),username);
else if (cfg.debug)
pam_syslog(pamh,LOG_DEBUG,"authentication succeeded");
- /* store password (needed if oldpassword was retreived from context) */
+ /* store password (needed if oldpassword was retrieved from context) */
if (ctx->authok==PAM_SUCCESS)
{
rc=pam_set_item(pamh,PAM_OLDAUTHTOK,oldpassword);
Modified: nss-pam-ldapd-0.8/pynslcd/alias.py
==============================================================================
--- nss-pam-ldapd-0.8/pynslcd/alias.py Sun Apr 28 22:20:47 2013 (r1949)
+++ nss-pam-ldapd-0.8/pynslcd/alias.py Sun Apr 28 22:32:30 2013 (r1950)
@@ -1,7 +1,7 @@
-# alias.py - lookup functions for aliasnet addresses
+# alias.py - lookup functions for email aliases
#
-# Copyright (C) 2010, 2011, 2012 Arthur de Jong
+# Copyright (C) 2010, 2011, 2012, 2013 Arthur de Jong
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
Modified: nss-pam-ldapd-0.8/pynslcd/shadow.py
==============================================================================
--- nss-pam-ldapd-0.8/pynslcd/shadow.py Sun Apr 28 22:20:47 2013 (r1949)
+++ nss-pam-ldapd-0.8/pynslcd/shadow.py Sun Apr 28 22:32:30 2013 (r1950)
@@ -1,7 +1,7 @@
-# shadow.py - lookup functions for shadownet addresses
+# shadow.py - lookup functions for shadow information
#
-# Copyright (C) 2010, 2011, 2012 Arthur de Jong
+# Copyright (C) 2010, 2011, 2012, 2013 Arthur de Jong
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/
- nss-pam-ldapd commit: r1950 - in nss-pam-ldapd-0.8: . nslcd pam pynslcd,
Commits of the nss-pam-ldapd project