* configure.ac (PAM_COMMON_INCLUDES): Add -I${top_srcdir}/lib.

(AC_OUTPUT): Add lib/Makefile.
* doc/pam-modules.texi: Document `transform' option.
* Make.rules: New file.

* lib/mem.c, lib/slist.c, lib/log.c, lib/converse.c,
lib/graypam.h, lib/Makefile.am, lib/transform.c.

* pam_regex/pam_regex.c: Implement user name transformations.

* pam_fshadow/Makefile.am, pam_sql/Makefile.am:
Add ../lib/libgraypam.la to LDADD
* pam_fshadow/pam_fshadow.c, pam_sql/pam_mysql.c,
pam_sql/pam_pgsql.c, pam_sql/pam_sql.c: Use functions from ../lib.


git-svn-id: file:///svnroot/pam-modules/trunk@63 56984be4-0537-0410-a56c-fcb268c96130

24 files changed, 1475 insertions, 480 deletions

diff --git a/ChangeLog b/ChangeLog
index e2fb656..80ebb18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2008-03-13  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+        * configure.ac (PAM_COMMON_INCLUDES): Add -I${top_srcdir}/lib.
+        (AC_OUTPUT): Add lib/Makefile.
+        * doc/pam-modules.texi: Document `transform' option.
+        * Make.rules: New file.
+
+        * lib/mem.c, lib/slist.c, lib/log.c, lib/converse.c,
+        lib/graypam.h, lib/Makefile.am, lib/transform.c.
+
+        * pam_regex/pam_regex.c: Implement user name transformations.
+        
+        * pam_fshadow/Makefile.am, pam_sql/Makefile.am:
+        Add ../lib/libgraypam.la to LDADD
+        * pam_fshadow/pam_fshadow.c, pam_sql/pam_mysql.c,
+        pam_sql/pam_pgsql.c, pam_sql/pam_sql.c: Use functions from ../lib.
+        
 2007-08-28  Sergey Poznyakoff  <gray@gnu.org.ua>
 
         * pam_fshadow/Makefile.am, pam_regex/Makefile.am,
diff --git a/Make.rules b/Make.rules
new file mode 100644
index 0000000..ecf28eb
--- /dev/null
+++ b/Make.rules
@@ -0,0 +1,26 @@
+# Copyright (C) 2001, 2006, 2007 Sergey Poznyakoff
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+.c.lo:
+        $(LIBTOOL) --mode=compile $(CC) -c -DHAVE_CONFIG_H \
+                $(CFLAGS) $(AM_CFLAGS) $(INCLUDES) $(CPPFLAGS) \
+                $(AM_CPPFLAGS) $<
+
+.lo.la: 
+        $(LIBTOOL) --mode=link $(CC) -module -export-dynamic \
+                   $(AM_LDFLAGS) \
+                 -o $@ $< $(AM_LDADD) $(LDADD) \
+                 -rpath $(pamdir) -shared
+
diff --git a/Makefile.am b/Makefile.am
index 0434695..7885d82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2006 Sergey Poznyakoff
+# Copyright (C) 2001, 2006, 2008 Sergey Poznyakoff
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,5 +14,4 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AUTOMAKE_OPTIONS = gnits 1.8
-SUBDIRS = doc pam_fshadow pam_regex pam_log pam_sql 
-EXTRA_DIST=common.c
+SUBDIRS = doc lib pam_fshadow pam_regex pam_log pam_sql 
diff --git a/NEWS b/NEWS
index 763e42c..7b01934 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,16 @@
-pam-modules -- history of user-visible changes. 2007-08-14
-Copyright (C) 2001,2004,2005,2007 Sergey Poznyakoff
+pam-modules -- history of user-visible changes. 2008-03-13
+Copyright (C) 2001,2004,2005,2007,2008 Sergey Poznyakoff
 See the end of file for copying conditions.
 
 Please send radius bug reports to <bug-pam-modules@gnu.org.ua>
 
-Version 1.2, CVS
+Version 1.2, SVN
 
-Several fixes in debugging code and pam_mysql, pam_pgsql modules.
+* Several fixes in debugging code and pam_mysql, pam_pgsql modules.
+
+* pam_regex transform=expr
+
+New command line option `transform' allows to rewrite user names.
 
 
 Version 1.1, 2007-08-11
@@ -37,7 +41,7 @@ Version 0.1
 =========================================================================
 Copyright information:
 
-Copyright (C) 2001,2004,2005 Sergey Poznyakoff
+Copyright (C) 2001,2004,2005,2007,2008 Sergey Poznyakoff
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/common.c b/common.c
deleted file mode 100644
index 6004929..0000000
--- a/common.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* This file is part of pam-modules.
-   Copyright (C) 2001, 2007 Sergey Poznyakoff
- 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 3 of the License, or (at your
-   option) any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License along
-   with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef PAM_CONV_AGAIN
-# define PAM_CONV_AGAIN PAM_TRY_AGAIN
-#endif
-#ifndef PAM_AUTHTOK_RECOVER_ERR
-# define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR
-#endif
-#ifndef PAM_EXTERN
-# define PAM_EXTERN
-#endif
-
-#include <regex.h>
-
-#define XSTRDUP(s) (s) ? strdup(s) : NULL
-
-#define PAM_OVERWRITE(s)                              \
-  do {                                                \
-        register char *p;                             \
-        if  ((p = s) != NULL)                         \
-            while (*p) *p++ = 0;                      \
-  } while (0) 
-
-#define PAM_DROP_REPLY(reply, nrepl)                  \
-  do {                                                \
-        int i;                                        \
-        for (i=0; i<nrepl; i++) {                     \
-            PAM_OVERWRITE(reply[i].resp);             \
-            free(reply[i].resp);                      \
-        }                                             \
-        if (reply)                                    \
-            free(reply);                              \
-  } while (0)
-        
-static void
-_pam_delete(char *x)
-{
-        PAM_OVERWRITE(x);
-        free(x);
-}
-
-static void
-_cleanup_string(pam_handle_t *pamh, void *x, int error_status)
-{
-        _pam_delete(x);
-}
-
-static void
-_cleanup_regex(pam_handle_t *pamh, void *x, int error_status)
-{
-        regfree((regex_t*)x);
-}
-
-static void _pam_log(int err, const char *format, ...);
-
-static void
-make_str(pam_handle_t *pamh, const char *str, const char *name, char **ret)
-{
-        int retval;
-        char *newstr = XSTRDUP(str);
-
-        retval = pam_set_data(pamh, name, (void *)newstr, _cleanup_string);
-        if (retval != PAM_SUCCESS) {
-                _pam_log(LOG_CRIT, 
-                         "can't keep data [%s]: %s",
-                         name,
-                         pam_strerror(pamh, retval));
-                _pam_delete(newstr);
-        } else {
-                *ret = newstr;
-                newstr = NULL;
-        }
-}
-
-#define MAKE_STR(pamh, str, var) \
- make_str(pamh,str,#var,&var)
-        
-/* Syslog functions */
-static int syslog_dont_open = 0;
-static const char *syslog_tag = MODULE_NAME;
-static int facility = LOG_AUTHPRIV;
-
-static void