cvs-nserver-commits Mailing List for CVS with rewritten network layer (Page 4)
Brought to you by:
tyranny
Menu
▾
▴
cvs-nserver-commits — cvs-nserver repository commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(41) |
Sep
(69) |
Oct
(12) |
Nov
(35) |
Dec
(43) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(12) |
Feb
(19) |
Mar
(55) |
Apr
(25) |
May
(69) |
Jun
(33) |
Jul
(3) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
(35) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Alexey M. <ty...@us...> - 2002-05-31 06:26:20
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv4535
Modified Files:
Tag: NCLI-1-11-1
zlib-client.c
Log Message:
Initialize couple of variables to keep valgrind happy
Index: zlib-client.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/zlib-client.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- zlib-client.c 10 Feb 2002 22:16:29 -0000 1.1.2.3
+++ zlib-client.c 31 May 2002 06:26:15 -0000 1.1.2.4
@@ -66,6 +66,7 @@
return NULL;
zcd->inflate_initialized = 0;
+ zcd->zsin_stream_end = 0;
nc->connect = zlib_connect;
nc->disconnect = zlib_disconnect;
@@ -103,6 +104,7 @@
zcd->zsin.zalloc = Z_NULL;
zcd->zsin.zfree = Z_NULL;
zcd->zsin.opaque = Z_NULL;
+ zcd->zsin.avail_in = 0;
return NCLI_SUCCESS;
}
|
|
From: Alexey M. <ty...@us...> - 2002-05-30 21:19:09
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv27458
Modified Files:
Tag: NCLI-1-11-1
acl.c
Log Message:
Audit log ACL operations
Index: acl.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/acl.c,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -d -r1.1.2.15 -r1.1.2.16
--- acl.c 30 May 2002 20:41:05 -0000 1.1.2.15
+++ acl.c 30 May 2002 21:19:07 -0000 1.1.2.16
@@ -241,6 +241,20 @@
if (!store_branch_acls(dir_acl))
error(1, 0, "Error storing branch ACLs: %s", strerror(errno));
+ /* log this operation */
+ if (audit_log_active()) {
+ if (!start_audit_log_line("acl")) {
+ error(1, 0, "Out of memory");
+ }
+ append_audit_log_line("grant");
+ append_audit_log_line("branch");
+ append_audit_log_line(perm_string);
+ append_audit_log_line(relative_name);
+ append_audit_log_line(username);
+ append_audit_log_line(branch);
+ log_audit_event();
+ }
+
error(0, 0, "Setting '%s' permissions for '%s' on file %s\n",
perm_string, username, relative_name);
@@ -256,6 +270,7 @@
struct stringbuf *fulldir;
DIR_ACL *dir_acl;
int default_len = strlen("default:");
+ int using_default_file_acls;
fulldir = new_stringbuf(current_parsed_root->directory);
if (fulldir == NULL)
@@ -268,7 +283,8 @@
if (dir_acl == NULL)
return -1;
- if (strncmp(perm_string, "default:", default_len) == 0) {
+ using_default_file_acls = (strncmp(perm_string, "default:", default_len) == 0);
+ if (using_default_file_acls) {
/* set default file permissions */
perm = parse_branch_permissions(perm_string + default_len);
if (perm == branch_perm_invalid)
@@ -299,6 +315,25 @@
if (store_dir_acl(dir_acl) != 0)
error(1, 0, "Error storing permissions on directory %s",
relative_name);
+
+ /* log this operation */
+ if (audit_log_active()) {
+ if (!start_audit_log_line("acl")) {
+ error(1, 0, "Out of memory");
+ }
+ append_audit_log_line("grant");
+ if (using_default_file_acls) {
+ append_audit_log_line("default-file");
+ append_audit_log_line(perm_string + default_len);
+ } else {
+ append_audit_log_line("dir");
+ append_audit_log_line(perm_string);
+ }
+ append_audit_log_line(relative_name);
+ append_audit_log_line(username);
+ append_audit_log_line(branch);
+ log_audit_event();
+ }
return 0;
}
|
|
From: Alexey M. <ty...@us...> - 2002-05-30 20:41:13
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv27907
Modified Files:
Tag: NCLI-1-11-1
acl.c
Log Message:
Audit log branch access control
Index: acl.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/acl.c,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -d -r1.1.2.14 -r1.1.2.15
--- acl.c 29 May 2002 05:09:48 -0000 1.1.2.14
+++ acl.c 30 May 2002 20:41:05 -0000 1.1.2.15
@@ -90,21 +90,37 @@
dir_permission perm, char *perm_string)
{
DIR_ACL *dir_acl;
+ char* xbranch = "trunk";
+ int retval = 0;
if (!server_active)
return 1;
- dir_acl = get_dir_acl(dir, "trunk");
+ dir_acl = get_dir_acl(dir, xbranch);
if (dir_acl == NULL)
error(1, 0, "Error getting directory ACL for %s: %s", dir, strerror(errno));
if (dir_permission_granted(dir_acl, CVS_Username, perm) != perm) {
error(0, 0, "%s permission for %s denied for user %s",
perm_string, filename, CVS_Username);
- return 0;
+ goto out;
}
- return 1;
+ retval = 1;
+ out:
+ if (audit_log_active()) {
+ if (!start_audit_log_line("authz-dir")) {
+ error(1, 0, "Out of memory");
+ }
+ append_audit_log_line(perm_string);
+ append_audit_log_line(dir);
+ append_audit_log_line(filename);
+ append_audit_log_line(xbranch);
+ append_audit_log_line(retval ? "granted" : "denied");
+ log_audit_event();
+ }
+
+ return retval;
}
#endif /* SERVER_SUPPORT */
@@ -225,7 +241,7 @@
if (!store_branch_acls(dir_acl))
error(1, 0, "Error storing branch ACLs: %s", strerror(errno));
- printf("Setting '%s' permissions for '%s' on file %s\n",
+ error(0, 0, "Setting '%s' permissions for '%s' on file %s\n",
perm_string, username, relative_name);
return 0;
@@ -258,11 +274,11 @@
if (perm == branch_perm_invalid)
error(1, 0, "Invalid default file permissions '%s'", perm_string);
- if (!set_default_file_acl(dir_acl, branch, username, perm))
+ if (set_default_file_acl(dir_acl, branch, username, perm) != perm)
error(1, 0, "Error setting default file permission %s on directory %s",
perm_string, relative_name);
- printf("Setting default file permissions '%s' for '%s' on directory %s\n",
+ error(0, 0, "Setting default file permissions '%s' for '%s' on directory %s\n",
perm_string, username, relative_name);
} else {
@@ -275,7 +291,7 @@
error(1, 0, "Error setting %s permissions on directory %s",
perm_string, relative_name);
- printf("Setting '%s' permissions for '%s' on directory %s\n",
+ error(0, 0, "Setting '%s' permissions for '%s' on directory %s\n",
perm_string, username, relative_name);
}
|
|
From: Alexey M. <mo...@us...> - 2002-05-30 13:54:55
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv16080
Modified Files:
Tag: NCLI-1-11-1
lsmodules.c
Log Message:
BUGFIX: stupid bug leading to client SIGSEGV fixed
Index: lsmodules.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/lsmodules.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- lsmodules.c 22 May 2002 22:48:24 -0000 1.1.2.5
+++ lsmodules.c 30 May 2002 13:54:46 -0000 1.1.2.6
@@ -266,6 +266,8 @@
lsmodules(int argc, char **argv)
{
int c;
+ if (argc == -1)
+ usage(lsmodules_usage);
mod_list = UNDEF_MOD_LIST; /* Set to initial value */
|
|
From: Alexey M. <ty...@us...> - 2002-05-29 05:09:51
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv19871
Modified Files:
Tag: NCLI-1-11-1
acl.c
Log Message:
Log authorization attempts
Index: acl.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/acl.c,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -d -r1.1.2.13 -r1.1.2.14
--- acl.c 28 Mar 2002 15:23:26 -0000 1.1.2.13
+++ acl.c 29 May 2002 05:09:48 -0000 1.1.2.14
@@ -20,6 +20,7 @@
#include "cvs.h"
#include "acl.h"
+#include "audit-log.h"
#include "repos.h"
#include "acl-admins.h"
@@ -38,15 +39,15 @@
struct DIR_ACL *dir_acl;
struct BRANCH_ACL *branch_acl;
struct BRANCH_ACE *branch_ace;
-
+ int retval = 0;
char *xbranch = branch;
- if ((xbranch == NULL) || (xbranch[0] == '\0'))
- xbranch = "trunk";
-
if (!server_active)
return 1;
+ if ((xbranch == NULL) || (xbranch[0] == '\0'))
+ xbranch = "trunk";
+
dir_acl = get_dir_acl(dir, "trunk");
if (dir_acl == NULL)
error(1, 0, "Error getting directory ACL for %s: %s", dir, strerror(errno));
@@ -64,10 +65,24 @@
error(0, 0, "%s permission for %s denied for user %s",
perm_string, filename, CVS_Username);
- return 0;
+ goto out;
}
- return 1;
+ retval = 1;
+ out:
+ if (audit_log_active()) {
+ if (!start_audit_log_line("authz")) {
+ error(1, 0, "Out of memory");
+ }
+ append_audit_log_line(perm_string);
+ append_audit_log_line(dir);
+ append_audit_log_line(filename);
+ append_audit_log_line(xbranch);
+ append_audit_log_line(retval ? "granted" : "denied");
+ log_audit_event();
+ }
+
+ return retval;
}
int
|
|
From: Alexey M. <ty...@us...> - 2002-05-29 05:08:54
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv19590
Modified Files:
Tag: NCLI-1-11-1
audit.c
Log Message:
Do not log if the logging is not active
Index: audit.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/audit.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- audit.c 25 May 2002 20:47:04 -0000 1.1.2.1
+++ audit.c 29 May 2002 05:08:52 -0000 1.1.2.2
@@ -26,20 +26,22 @@
operation_audit_log(const char* operation, struct file_info* finfo,
const char* branch, const char* rev)
{
- if (!start_audit_log_line(operation)) {
- error(1, 0, "Out of memory");
+ if (audit_log_active()) {
+ if (!start_audit_log_line(operation)) {
+ error(1, 0, "Out of memory");
+ }
+ append_audit_log_line(finfo->repository + Pserver_Repos_len + 1);
+ append_audit_log_line(finfo->file);
+ if (branch == NULL)
+ append_audit_log_line("");
+ else
+ append_audit_log_line(branch);
+ if (rev == NULL)
+ append_audit_log_line("");
+ else
+ append_audit_log_line(rev);
+ log_audit_event();
}
- append_audit_log_line(finfo->repository + Pserver_Repos_len + 1);
- append_audit_log_line(finfo->file);
- if (branch == NULL)
- append_audit_log_line("");
- else
- append_audit_log_line(branch);
- if (rev == NULL)
- append_audit_log_line("");
- else
- append_audit_log_line(rev);
- log_audit_event();
return 1;
}
|
|
From: Alexey M. <ty...@us...> - 2002-05-29 05:07:23
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv19337
Modified Files:
Tag: NCLI-1-11-1
audit-log.c audit-log.h
Log Message:
Audit logging could be inactive;
allow clients to learn that
Index: audit-log.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/audit-log.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- audit-log.c 25 May 2002 20:48:05 -0000 1.1.2.5
+++ audit-log.c 29 May 2002 05:07:21 -0000 1.1.2.6
@@ -33,6 +33,7 @@
#include "stringbuf.h"
static int fd[2];
+static int audit_log_is_active = 0;
static struct stringbuf* audit_log_line = NULL;
@@ -56,6 +57,8 @@
/* parent */
close(fd[0]);
+ audit_log_is_active = 1;
+
} else {
/* child */
char* lh_copy;
@@ -113,6 +116,13 @@
write(fd[1], cr, strlen(cr));
return 1;
+}
+
+
+int
+audit_log_active (void)
+{
+ return audit_log_is_active;
}
Index: audit-log.h
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/audit-log.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- audit-log.h 25 May 2002 20:49:12 -0000 1.1.2.3
+++ audit-log.h 29 May 2002 05:07:21 -0000 1.1.2.4
@@ -20,6 +20,8 @@
int start_logging_helper (const char* logging_helper);
+int audit_log_active (void);
+
int log_audit_event (void);
char* get_client_ip_address (void);
|
|
From: Alexey M. <ty...@us...> - 2002-05-29 05:06:39
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv18388
Modified Files:
Tag: NCLI-1-11-1
rcs.c
Log Message:
Handle case where file is added locally
and the working copy is being updated
Index: rcs.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/rcs.c,v
retrieving revision 1.1.1.7.4.1
retrieving revision 1.1.1.7.4.2
diff -u -d -r1.1.1.7.4.1 -r1.1.1.7.4.2
--- rcs.c 25 May 2002 20:59:50 -0000 1.1.1.7.4.1
+++ rcs.c 29 May 2002 05:06:23 -0000 1.1.1.7.4.2
@@ -8443,7 +8443,7 @@
int all_numeric;
char* p;
char* orig_version;
- char* version;
+ char* version = NULL;
char* branch = NULL;
char* pZ;
char* pT;
@@ -8451,11 +8451,20 @@
/* see if the `rev' is all numeric */
all_numeric = 1;
- for (p = rev; *p; p++) {
- if (!isdigit(*p) && (*p != '.')) {
- all_numeric = 0;
- break;
+ if (rev) {
+ for (p = rev; *p; p++) {
+ if (!isdigit(*p) && (*p != '.')) {
+ all_numeric = 0;
+ break;
+ }
}
+ } else
+ all_numeric = 0;
+
+ if (!rcs) {
+ if (!all_numeric)
+ branch = rev;
+ goto out;
}
/* don't call RCS_getversion if `rev' is all numeric */
|
Update of /cvsroot/cvs-nserver/checkpassword-ldap
In directory usw-pr-cvs1:/tmp/cvs-serv6403
Added Files:
.cvsignore AUTHORS COPYING ChangeLog INSTALL Makefile.am
Makefile.in NEWS README aclocal.m4 checkpassword-ldap.c
config.h.in config.status configure configure.ac depcomp
getopt.c getopt.h getopt1.c install-sh interface.html
ldap-support.c ldap-support.h logging.h missing mkinstalldirs
stamp-h.in
Log Message:
Initial version
--- NEW FILE: .cvsignore ---
Makefile
.deps
config.h
checkpassword-ldap
config.status
config.log
autom4te.cache
stamp-h
stamp-h1
local-configure.sh
configure.stamp
build-stamp
*.tar.gz
--- NEW FILE: AUTHORS ---
checkpassword-ldap written by
Alexey Mahotkin <al...@hs...>
checkpassword interface was designed by
D. J. Bernstein <dj...@cr...>
--- NEW FILE: COPYING ---
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
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 2 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, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
--- NEW FILE: ChangeLog ---
--- NEW FILE: INSTALL ---
Basic Installation
==================
These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, a file
`config.cache' that saves the results of its tests to speed up
reconfiguring, and a file `config.log' containing compiler output
(useful mainly for debugging `configure').
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If at some point `config.cache'
contains results you don't want to keep, you may remove or edit it.
The file `configure.in' is used to create `configure' by a program
called `autoconf'. You only need `configure.in' if you want to change
it or regenerate `configure' using a newer version of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system. If you're
using `csh' on an old version of System V, you might need to type
`sh ./configure' instead to prevent `csh' from trying to execute
`configure' itself.
Running `configure' takes awhile. While running, it prints some
messages telling which features it is checking for.
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
the package.
4. Type `make install' to install the programs and any data files and
documentation.
5. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
also a `make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that
the `configure' script does not know about. You can give `configure'
initial values for variables by setting them in the environment. Using
a Bourne-compatible shell, you can do that on the command line like
this:
CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
Or on systems that have the `env' program, you can do it like this:
env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
If you have to use a `make' that does not supports the `VPATH'
variable, you have to compile the package for one architecture at a time
in the source code directory. After you have installed the package for
one architecture, use `make distclean' before reconfiguring for another
architecture.
Installation Names
==================
By default, `make install' will install the package's files in
`/usr/local/bin', `/usr/local/man', etc. You can specify an
installation prefix other than `/usr/local' by giving `configure' the
option `--prefix=PATH'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
give `configure' the option `--exec-prefix=PATH', the package will use
PATH as the prefix for installing programs and libraries.
Documentation and other data files will still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=PATH' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.
For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Specifying the System Type
==========================
There may be some features `configure' can not figure out
automatically, but needs to determine by the type of host the package
will run on. Usually `configure' can figure that out, but if it prints
a message saying it can not guess the host type, give it the
`--host=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name with three fields:
CPU-COMPANY-SYSTEM
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the host type.
If you are building compiler tools for cross-compiling, you can also
use the `--target=TYPE' option to select the type of system they will
produce code for and the `--build=TYPE' option to select the type of
system on which you are compiling the package.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share,
you can create a site shell script called `config.site' that gives
default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.
Operation Controls
==================
`configure' recognizes the following options to control how it
operates.
`--cache-file=FILE'
Use and save the results of the tests in FILE instead of
`./config.cache'. Set FILE to `/dev/null' to disable caching, for
debugging `configure'.
`--help'
Print a summary of the options to `configure', and exit.
`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).
`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`--version'
Print the version of Autoconf used to generate the `configure'
script, and exit.
`configure' also accepts some other, not widely useful, options.
--- NEW FILE: Makefile.am ---
#
# Makefile.am for checkpassword-ldap
#
bin_PROGRAMS = checkpassword-ldap
checkpassword_ldap_SOURCES = checkpassword-ldap.c logging.h ldap-support.h ldap-support.c \
getopt.h getopt.c getopt1.c
EXTRA_DIST = interface.html
--- NEW FILE: Makefile.in ---
# Makefile.in generated automatically by automake 1.5 from Makefile.am.
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@SET_MAKE@
#
# Makefile.am for checkpassword-ldap
#
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
AMTAR = @AMTAR@
AWK = @AWK@
CC = @CC@
DEPDIR = @DEPDIR@
EXEEXT = @EXEEXT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
MAINT = @MAINT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
am__include = @am__include@
am__quote = @am__quote@
install_sh = @install_sh@
bin_PROGRAMS = checkpassword-ldap
checkpassword_ldap_SOURCES = checkpassword-ldap.c logging.h ldap-support.h ldap-support.c \
getopt.h getopt.c getopt1.c
EXTRA_DIST = interface.html
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
bin_PROGRAMS = checkpassword-ldap$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
am_checkpassword_ldap_OBJECTS = checkpassword-ldap.$(OBJEXT) \
ldap-support.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT)
checkpassword_ldap_OBJECTS = $(am_checkpassword_ldap_OBJECTS)
checkpassword_ldap_LDADD = $(LDADD)
checkpassword_ldap_DEPENDENCIES =
checkpassword_ldap_LDFLAGS =
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/depcomp
@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/checkpassword-ldap.Po \
@AMDEP_TRUE@ $(DEPDIR)/getopt.Po $(DEPDIR)/getopt1.Po \
@AMDEP_TRUE@ $(DEPDIR)/ldap-support.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
CFLAGS = @CFLAGS@
DIST_SOURCES = $(checkpassword_ldap_SOURCES)
DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
Makefile.am Makefile.in NEWS aclocal.m4 config.h.in configure \
configure.ac depcomp install-sh missing mkinstalldirs
SOURCES = $(checkpassword_ldap_SOURCES)
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
.SUFFIXES: .c .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && \
CONFIG_HEADERS= CONFIG_LINKS= \
CONFIG_FILES=$@ $(SHELL) ./config.status
$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h
@if test ! -f $@; then \
rm -f stamp-h; \
$(MAKE) stamp-h; \
else :; fi
stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h stamp-hT
@echo timestamp > stamp-hT 2> /dev/null
cd $(top_builddir) \
&& CONFIG_FILES= CONFIG_HEADERS=config.h \
$(SHELL) ./config.status
@mv stamp-hT stamp-h
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/./stamp-h.in
@if test ! -f $@; then \
rm -f $(srcdir)/./stamp-h.in; \
$(MAKE) $(srcdir)/./stamp-h.in; \
else :; fi
$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4)
@rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT
@echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null
cd $(top_srcdir) && $(AUTOHEADER)
@mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in
distclean-hdr:
-rm -f config.h
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
; then \
f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
else :; fi; \
done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
rm -f $(DESTDIR)$(bindir)/$$f; \
done
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
checkpassword-ldap$(EXEEXT): $(checkpassword_ldap_OBJECTS) $(checkpassword_ldap_DEPENDENCIES)
@rm -f checkpassword-ldap$(EXEEXT)
$(LINK) $(checkpassword_ldap_LDFLAGS) $(checkpassword_ldap_OBJECTS) $(checkpassword_ldap_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/checkpassword-ldap.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt1.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ldap-support.Po@am__quote@
distclean-depend:
-rm -rf $(DEPDIR)
.c.o:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
.c.obj:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `cygpath -w $<`
CCDEPMODE = @CCDEPMODE@
uninstall-info-am:
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique $(LISP)
TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
|| etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)
GTAGS:
here=`CDPATH=: && cd $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = .
# Avoid unsightly `./'.
distdir = $(PACKAGE)-$(VERSION)
GZIP_ENV = --best
distdir: $(DISTFILES)
-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
mkdir $(distdir)
@for file in $(DISTFILES); do \
if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
$(mkinstalldirs) "$(distdir)/$$dir"; \
fi; \
if test -d $$d/$$file; then \
cp -pR $$d/$$file $(distdir) \
|| exit 1; \
else \
test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist: distdir
$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
# tarfile.
distcheck: dist
-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/=build
mkdir $(distdir)/=inst
chmod a-w $(distdir)
dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \
&& cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
&& $(MAKE) $(AM_MAKEFLAGS) uninstall \
&& (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
|| (echo "Error: files left after uninstall" 1>&2; \
exit 1) ) \
&& $(MAKE) $(AM_MAKEFLAGS) dist \
&& $(MAKE) $(AM_MAKEFLAGS) distclean \
&& rm -f $(distdir).tar.gz \
&& (test `find . -type f -print | wc -l` -eq 0 \
|| (echo "Error: files left after distclean" 1>&2; \
exit 1) )
-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
@echo "$(distdir).tar.gz is ready for distribution" | \
sed 'h;s/./=/g;p;x;p;x'
check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS) config.h
installdirs:
$(mkinstalldirs) $(DESTDIR)$(bindir)
install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
dist-all: distdir
$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
distclean: distclean-am
-rm -f config.status config.cache config.log
distclean-am: clean-am distclean-compile distclean-depend \
distclean-generic distclean-hdr distclean-tags
dvi: dvi-am
dvi-am:
info: info-am
info-am:
install-data-am:
install-exec-am: install-binPROGRAMS
install-info: install-info-am
install-man:
installcheck-am:
maintainer-clean: maintainer-clean-am
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
uninstall-am: uninstall-binPROGRAMS uninstall-info-am
.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic dist dist-all distcheck distclean \
distclean-compile distclean-depend distclean-generic \
distclean-hdr distclean-tags distdir dvi dvi-am info info-am \
install install-am install-binPROGRAMS install-data \
install-data-am install-exec install-exec-am install-info \
install-info-am install-man install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic tags uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
--- NEW FILE: NEWS ---
0.96
Remove --stdin option, because manual testing could be done
with a shell redirection.
0.95
Initial version.
--- NEW FILE: README ---
http://checkpasswd-pam.sourceforge.net/
checkpassword-pam is an implementation of checkpassword-compatible
authentication program.
Checkpassword is described in <URL:http://cr.yp.to/checkpwd.html>
checkpassword-pam was written from scratch. There are several older
packages called checkpassword-pam, derived from DJB's checkpassword
code. This checkpassword-pam is more modern and
administrator-friendly.
If you are using Linux-PAM, make sure it is more recent than 0.59.
Incompatibilities are in the PAM conversation function (number of
requests vs number of responses). All modern Linux distribution use
PAM newer than that.
--- NEW FILE: aclocal.m4 ---
# aclocal.m4 generated automatically by aclocal 1.5
# Copyright 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
# Do all the work for Automake. This macro actually does too much --
# some checks are only needed if your package does certain things.
# But this isn't really a big deal.
# serial 5
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
# will think it sees a *use*, and therefore will trigger all it's
# C support machinery. Also note that it means that autoscan, seeing
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
# We require 2.13 because we rely on SHELL being computed by configure.
AC_PREREQ([2.13])
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
# -----------------------------------------------------------
# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED.
# The purpose of this macro is to provide the user with a means to
# check macros which are provided without letting her know how the
# information is coded.
# If this macro is not defined by Autoconf, define it here.
ifdef([AC_PROVIDE_IFELSE],
[],
[define([AC_PROVIDE_IFELSE],
[ifdef([AC_PROVIDE_$1],
[$2], [$3])])])
# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE])
# ----------------------------------------------
AC_DEFUN([AM_INIT_AUTOMAKE],
[AC_REQUIRE([AC_PROG_INSTALL])dnl
# test to see if srcdir already configured
if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
test -f $srcdir/config.status; then
AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first])
fi
# Define the identity of the package.
PACKAGE=$1
AC_SUBST(PACKAGE)dnl
VERSION=$2
AC_SUBST(VERSION)dnl
ifelse([$3],,
[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
# the ones we care about.
ifdef([m4_pattern_allow],
[m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl
# Autoconf 2.50 always computes EXEEXT. However we need to be
# compatible with 2.13, for now. So we always define EXEEXT, but we
# don't compute it.
AC_SUBST(EXEEXT)
# Similar for OBJEXT -- only we only use OBJEXT if the user actually
# requests that it be used. This is a bit dumb.
: ${OBJEXT=o}
AC_SUBST(OBJEXT)
# Some tools Automake needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl
AM_MISSING_PROG(ACLOCAL, aclocal)
AM_MISSING_PROG(AUTOCONF, autoconf)
AM_MISSING_PROG(AUTOMAKE, automake)
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
AM_MISSING_PROG(AMTAR, tar)
AM_PROG_INSTALL_SH
AM_PROG_INSTALL_STRIP
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
AC_REQUIRE([AM_SET_DEPDIR])dnl
AC_PROVIDE_IFELSE([AC_PROG_][CC],
[_AM_DEPENDENCIES(CC)],
[define([AC_PROG_][CC],
defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_][CXX],
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_][CXX],
defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
])
#
# Check to make sure that the build environment is sane.
#
# serial 3
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
echo timestamp > conftest.file
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
if test "$[*]" = "X"; then
# -L didn't work.
set X `ls -t $srcdir/configure conftest.file`
fi
rm -f conftest.file
if test "$[*]" != "X $srcdir/configure conftest.file" \
&& test "$[*]" != "X conftest.file $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
alias in your environment])
fi
test "$[2]" = conftest.file
)
then
# Ok.
:
else
AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
AC_MSG_RESULT(yes)])
# serial 2
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
AC_DEFUN([AM_MISSING_PROG],
[AC_REQUIRE([AM_MISSING_HAS_RUN])
$1=${$1-"${am_missing_run}$2"}
AC_SUBST($1)])
# AM_MISSING_HAS_RUN
# ------------------
# Define MISSING if not defined so far and test if it supports --run.
# If it does, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
am_backtick='`'
AC_MSG_WARN([${am_backtick}missing' script is too old or missing])
fi
])
# AM_AUX_DIR_EXPAND
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
#
# Of course, Automake must honor this variable whenever it calls a
# tool from the auxiliary directory. The problem is that $srcdir (and
# therefore $ac_aux_dir as well) can be either absolute or relative,
# depending on how configure is run. This is pretty annoying, since
# it makes $ac_aux_dir quite unusable in subdirectories: in the top
# source directory, any form will work fine, but in subdirectories a
# relative path needs to be adjusted first.
#
# $ac_aux_dir/missing
# fails when called from a subdirectory if $ac_aux_dir is relative
# $top_srcdir/$ac_aux_dir/missing
# fails if $ac_aux_dir is absolute,
# fails when called from a subdirectory in a VPATH build with
# a relative $ac_aux_dir
#
# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
# are both prefixed by $srcdir. In an in-source build this is usually
# harmless because $srcdir is `.', but things will broke when you
# start a VPATH build or use an absolute $srcdir.
#
# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
# and then we would define $MISSING as
# MISSING="\${SHELL} $am_aux_dir/missing"
# This will work as long as MISSING is not called from configure, because
# unfortunately $(top_srcdir) has no meaning in configure.
# However there are other variables, like CC, which are often used in
# configure, and could therefore not use this "fixed" $ac_aux_dir.
#
# Another solution, used here, is to always expand $ac_aux_dir to an
# absolute PATH. The drawback is that using absolute paths prevent a
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND], [
# expand $ac_aux_dir to an absolute path
am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
])
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
install_sh=${install_sh-"$am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
# One issue with vendor `install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
# is unlikely to handle the host's binaries.
# Fortunately install-sh will honor a STRIPPROG variable, so we
# always use install-sh in `make install-strip', and initialize
# STRIPPROG with the value of the STRIP variable (set by the user).
AC_DEFUN([AM_PROG_INSTALL_STRIP],
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# serial 4 -*- Autoconf -*-
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
# will think it sees a *use*, and therefore will trigger all it's
# C support machinery. Also note that it means that autoscan, seeing
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
# _AM_DEPENDENCIES(NAME)
# ---------------------
# See how the compiler implements dependency checking.
# NAME is "CC", "CXX" or "OBJC".
# We try a few techniques and use that to set a single cache variable.
#
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
# dependency, and given that the user is not expected to run this macro,
# just rely on AC_PROG_CC.
AC_DEFUN([_AM_DEPENDENCIES],
[AC_REQUIRE([AM_SET_DEPDIR])dnl
AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
AC_REQUIRE([AM_MAKE_INCLUDE])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc']
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
AC_CACHE_CHECK([dependency style of $depcc],
[am_cv_$1_dependencies_compiler_type],
[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
cp "$am_depcomp" conftest.dir
cd conftest.dir
am_cv_$1_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
for depmode in $am_compiler_list; do
# We need to recreate these files for each test, as the compiler may
# overwrite some of them when testing with obscure command lines.
# This happens at least with the AIX C compiler.
echo '#include "conftest.h"' > conftest.c
echo 'int i;' > conftest.h
echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
case $depmode in
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
if test "x$enable_dependency_tracking" = xyes; then
continue
else
break
fi
;;
none) break ;;
esac
# We check with `-c' and `-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
# handle `-M -o', and we need to detect this.
if depmode=$depmode \
source=conftest.c object=conftest.o \
depfile=conftest.Po tmpdepfile=conftest.TPo \
$SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
grep conftest.h conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
am_cv_$1_dependencies_compiler_type=$depmode
break
fi
done
cd ..
rm -rf conftest.dir
else
am_cv_$1_dependencies_compiler_type=none
fi
])
$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type"
AC_SUBST([$1DEPMODE])
])
# AM_SET_DEPDIR
# -------------
# Choose a directory name for dependency files.
# This macro is AC_REQUIREd in _AM_DEPENDENCIES
AC_DEFUN([AM_SET_DEPDIR],
[rm -f .deps 2>/dev/null
mkdir .deps 2>/dev/null
if test -d .deps; then
DEPDIR=.deps
else
# MS-DOS does not allow filenames that begin with a dot.
DEPDIR=_deps
fi
rmdir .deps 2>/dev/null
AC_SUBST(DEPDIR)
])
# AM_DEP_TRACK
# ------------
AC_DEFUN([AM_DEP_TRACK],
[AC_ARG_ENABLE(dependency-tracking,
[ --disable-dependency-tracking Speeds up one-time builds
--enable-dependency-tracking Do not reject slow dependency extractors])
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
pushdef([subst], defn([AC_SUBST]))
subst(AMDEPBACKSLASH)
popdef([subst])
])
# Generate code to set up dependency tracking.
# This macro should only be invoked once -- use via AC_REQUIRE.
# Usage:
# AM_OUTPUT_DEPENDENCY_COMMANDS
#
# This code is only required when automatic dependency tracking
# is enabled. FIXME. This creates each `.P' file that we will
# need in order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
AC_OUTPUT_COMMANDS([
test x"$AMDEP_TRUE" != x"" ||
for mf in $CONFIG_FILES; do
case "$mf" in
Makefile) dirpart=.;;
*/Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;;
*) continue;;
esac
grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
# Extract the definition of DEP_FILES from the Makefile without
# running `make'.
DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
test -z "$DEPDIR" && continue
# When using ansi2knr, U may be empty or an underscore; expand it
U=`sed -n -e '/^U = / s///p' < "$mf"`
test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
# We invoke sed twice because it is the simplest approach to
# changing $(DEPDIR) to its actual value in the expansion.
for file in `sed -n -e '
/^DEP_FILES = .*\\\\$/ {
s/^DEP_FILES = //
:loop
s/\\\\$//
p
n
/\\\\$/ b loop
p
}
/^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`echo "$file" | sed -e 's|/[^/]*$||'`
$ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
done
], [AMDEP_TRUE="$AMDEP_TRUE"
ac_aux_dir="$ac_aux_dir"])])
# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
AC_DEFUN([AM_MAKE_INCLUDE],
[am_make=${MAKE-make}
cat > confinc << 'END'
doit:
@echo done
END
# If we don't find an include directive, just comment out the code.
AC_MSG_CHECKING([for style of include used by $am_make])
am__include='#'
am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
# We grep out `Entering directory' and `Leaving directory'
# messages which can occur if `w' ends up in MAKEFLAGS.
# In particular we don't look at `^make:' because GNU make might
# be invoked under some other name (usually "gmake"), in which
# case it prints its new name instead of `make'.
if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
am__include=include
am__quote=
_am_result=GNU
fi
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
am__include=.include
am__quote='"'
_am_result=BSD
fi
fi
AC_SUBST(am__include)
AC_SUBST(am__quote)
AC_MSG_RESULT($_am_result)
rm -f confinc confmf
])
# serial 3
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
#
# FIXME: Once using 2.50, use this:
# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl
AC_DEFUN([AM_CONDITIONAL],
[ifelse([$1], [TRUE],
[errprint(__file__:__line__: [$0: invalid condition: $1
])dnl
m4exit(1)])dnl
ifelse([$1], [FALSE],
[errprint(__file__:__line__: [$0: invalid condition: $1
])dnl
m4exit(1)])dnl
AC_SUBST([$1_TRUE])
AC_SUBST([$1_FALSE])
if $2; then
$1_TRUE=
$1_FALSE='#'
else
$1_TRUE='#'
$1_FALSE=
fi])
# Add --enable-maintainer-mode option to configure.
# From Jim Meyering
# serial 1
AC_DEFUN([AM_MAINTAINER_MODE],
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode is disabled by default
AC_ARG_ENABLE(maintainer-mode,
[ --enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer],
USE_MAINTAINER_MODE=$enableval,
USE_MAINTAINER_MODE=no)
AC_MSG_RESULT([$USE_MAINTAINER_MODE])
AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
MAINT=$MAINTAINER_MODE_TRUE
AC_SUBST(MAINT)dnl
]
)
# Like AC_CONFIG_HEADER, but automatically create stamp file.
# serial 3
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
# that is generated. We must strip everything past the first ":",
# and everything past the last "/".
AC_PREREQ([2.12])
AC_DEFUN([AM_CONFIG_HEADER],
[ifdef([AC_FOREACH],dnl
[dnl init our file count if it isn't already
m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0]))
dnl prepare to store our destination file list for use in config.status
AC_FOREACH([_AM_File], [$1],
[m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*]))
m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index))
dnl and add it to the list of files AC keeps track of, along
dnl with our hook
AC_CONFIG_HEADERS(_AM_File,
dnl COMMANDS, [, INIT-CMDS]
[# update the timestamp
echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index["
][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS
m4_popdef([_AM_Dest])])],dnl
[AC_CONFIG_HEADER([$1])
AC_OUTPUT_COMMANDS(
ifelse(patsubst([$1], [[^ ]], []),
[],
[test -z "$CONFIG_HEADERS" || echo timestamp >dnl
patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl
[am_indx=1
for am_file in $1; do
case " \$CONFIG_HEADERS " in
*" \$am_file "*)
am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\`
if test -n "\$am_dir"; then
am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\`
for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do
am_tmpdir=\$am_tmpdir\$am_subdir/
if test ! -d \$am_tmpdir; then
mkdir \$am_tmpdir
fi
done
fi
echo timestamp > "\$am_dir"stamp-h\$am_indx
;;
esac
am_indx=\`expr \$am_indx + 1\`
done])
])]) # AM_CONFIG_HEADER
# _AM_DIRNAME(PATH)
# -----------------
# Like AS_DIRNAME, only do it during macro expansion
AC_DEFUN([_AM_DIRNAME],
[m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1,
m4_if(m4_regexp([$1], [^/.*]), -1,
[.],
m4_patsubst([$1], [^\(/\).*], [\1])),
m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
]) # _AM_DIRNAME
--- NEW FILE: checkpassword-ldap.c ---
/*
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 2, 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 PU...
[truncated message content] |
|
From: Alexey M. <ty...@us...> - 2002-05-27 20:24:07
|
Update of /cvsroot/cvs-nserver/checkpassword-ldap In directory usw-pr-cvs1:/tmp/cvs-serv1063/checkpassword-ldap Log Message: Directory /cvsroot/cvs-nserver/checkpassword-ldap added to the repository |
|
From: Alexey M. <ty...@us...> - 2002-05-25 21:07:34
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv7562
Modified Files:
Tag: NCLI-1-11-1
annotate.c commit.c diff.c patch.c update.c
Log Message:
Preliminary support for logging of file operations;
switch to branch_for_revision(), thus bringing back all-numeric
revisions under ACL control
Index: annotate.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/annotate.c,v
retrieving revision 1.1.1.1.4.4
retrieving revision 1.1.1.1.4.5
diff -u -d -r1.1.1.1.4.4 -r1.1.1.1.4.5
--- annotate.c 25 Nov 2001 20:45:30 -0000 1.1.1.1.4.4
+++ annotate.c 25 May 2002 21:07:31 -0000 1.1.1.1.4.5
@@ -14,6 +14,7 @@
#include "cvs.h"
#include "acl.h"
+#include "audit.h"
#include "recurse.h"
/* Options from the command line. */
@@ -255,14 +256,6 @@
{
char *version;
-/* printf("annotate_fileproc: tag == '%s'\n", tag); */
-
-#ifdef SERVER_SUPPORT
- if (!grant_file_permission(finfo->repository, tag, finfo->file,
- branch_perm_checkout, "annotate"))
- return 0;
-#endif
-
if (finfo->rcs == NULL)
return (1);
@@ -273,6 +266,18 @@
(int *) NULL);
if (version == NULL)
return 0;
+
+#ifdef SERVER_SUPPORT
+ if (server_active) {
+ char* branch = branch_for_revision(finfo->rcs, tag);
+
+ if (!grant_file_permission(finfo->repository, branch, finfo->file,
+ branch_perm_checkout, "annotate")) {
+ return 0;
+ }
+ operation_audit_log("annotate", finfo, branch, version);
+ }
+#endif
/* Distinguish output for various files if we are processing
several files. */
Index: commit.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/commit.c,v
retrieving revision 1.1.1.6.4.4
retrieving revision 1.1.1.6.4.5
diff -u -d -r1.1.1.6.4.4 -r1.1.1.6.4.5
--- commit.c 25 Nov 2001 20:45:30 -0000 1.1.1.6.4.4
+++ commit.c 25 May 2002 21:07:31 -0000 1.1.1.6.4.5
@@ -18,6 +18,7 @@
#include "cvs.h"
#include "acl.h"
+#include "audit.h"
#include "getline.h"
#include "edit.h"
#include "fileattr.h"
@@ -809,9 +810,20 @@
status = classify_file_internal (finfo, &vers);
#ifdef SERVER_SUPPORT
- if (!grant_file_permission(finfo->repository, vers->tag, finfo->file,
- branch_perm_checkin, "checkin"))
- goto out;
+ if (server_active) {
+ char* branch;
+
+ if (saved_tag)
+ branch = branch_for_revision(finfo->rcs, saved_tag);
+ else
+ branch = branch_for_revision(finfo->rcs, vers->tag);
+
+ if (!grant_file_permission(finfo->repository, branch, finfo->file,
+ branch_perm_checkin, "checkin"))
+ goto out;
+
+ operation_audit_log("checkin", finfo, branch, vers->tag);
+ }
#endif
/*
Index: diff.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/diff.c,v
retrieving revision 1.1.1.3.4.3
retrieving revision 1.1.1.3.4.4
diff -u -d -r1.1.1.3.4.3 -r1.1.1.3.4.4
--- diff.c 25 Nov 2001 20:45:30 -0000 1.1.1.3.4.3
+++ diff.c 25 May 2002 21:07:31 -0000 1.1.1.3.4.4
@@ -17,6 +17,7 @@
#include "cvs.h"
#include "acl.h"
+#include "audit.h"
#include "recurse.h"
enum diff_file
@@ -400,26 +401,15 @@
int status, err = 2; /* 2 == trouble, like rcsdiff */
Vers_TS *vers;
enum diff_file empty_file = DIFF_DIFFERENT;
- char *tmp;
+ char *tmp = NULL;
char *tocvsPath;
- char *fname;
+ char *fname = NULL;
char *label1;
char *label2;
- /* Initialize these solely to avoid warnings from gcc -Wall about
- variables that might be used uninitialized. */
- tmp = NULL;
- fname = NULL;
-
user_file_rev = 0;
vers = Version_TS (finfo, NULL, NULL, NULL, 1, 0);
-#ifdef SERVER_SUPPORT
- if (!grant_file_permission(finfo->repository, vers->tag, finfo->file,
- branch_perm_checkout, "diff"))
- return 0;
-#endif
-
if (diff_rev2 != NULL || diff_date2 != NULL)
{
/* Skip all the following checks regarding the user file; we're
@@ -646,6 +636,25 @@
label2 =
make_file_label (finfo->fullname, use_rev2, vers ? vers->srcfile : NULL);
}
+
+#ifdef SERVER_SUPPORT
+ if (server_active) {
+ char* branch1 = branch_for_revision(vers->srcfile, use_rev1);
+ char* branch2 = branch_for_revision(vers->srcfile, use_rev2);
+ /* check that first revision could be accessed */
+ if (!grant_file_permission(finfo->repository, branch1, finfo->file,
+ branch_perm_checkout, "diff"))
+ return 0;
+
+ /* check that second revision could be accessed */
+ if (!grant_file_permission(finfo->repository, branch2, finfo->file,
+ branch_perm_checkout, "diff"))
+ return 0;
+
+ operation_audit_log("diff-from", finfo, branch1, use_rev1);
+ operation_audit_log("diff-to", finfo, branch2, use_rev2);
+ }
+#endif /* SERVER_SUPPORT */
if (empty_file == DIFF_ADDED || empty_file == DIFF_REMOVED)
{
Index: patch.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/patch.c,v
retrieving revision 1.1.1.3.4.4
retrieving revision 1.1.1.3.4.5
diff -u -d -r1.1.1.3.4.4 -r1.1.1.3.4.5
--- patch.c 25 Nov 2001 20:45:30 -0000 1.1.1.3.4.4
+++ patch.c 25 May 2002 21:07:31 -0000 1.1.1.3.4.5
@@ -17,6 +17,7 @@
#include "cvs.h"
#include "acl.h"
+#include "audit.h"
#include "getline.h"
#include "recurse.h"
@@ -407,9 +408,16 @@
}
#ifdef SERVER_SUPPORT
- if (!grant_file_permission(finfo->repository, rcsfile->branch, finfo->file,
- branch_perm_checkout, "patch"))
- return 0;
+ if (server_active) {
+ char* branch = branch_for_revision(finfo->rcs, rcsfile->branch);
+
+ if (!grant_file_permission(finfo->repository, branch, finfo->file,
+ branch_perm_checkout, "patch")) {
+ return 0;
+ }
+
+ operation_audit_log("patch", finfo, branch, rcsfile->branch);
+ }
#endif
if ((rcsfile->flags & VALID) && (rcsfile->flags & INATTIC))
Index: update.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/update.c,v
retrieving revision 1.1.1.6.4.6
retrieving revision 1.1.1.6.4.7
diff -u -d -r1.1.1.6.4.6 -r1.1.1.6.4.7
--- update.c 25 May 2002 15:58:36 -0000 1.1.1.6.4.6
+++ update.c 25 May 2002 21:07:31 -0000 1.1.1.6.4.7
@@ -39,7 +39,7 @@
#include "md5.h"
#endif
#include "acl.h"
-#include "audit-log.h"
+#include "audit.h"
#include "watch.h"
#include "fileattr.h"
#include "edit.h"
@@ -599,23 +599,17 @@
aflag, &vers, pipeout);
#ifdef SERVER_SUPPORT
- if (!grant_file_permission(finfo->repository, vers->tag, finfo->file,
- branch_perm_checkout, "update"))
- return 0;
+ if (server_active) {
+ char* branch = branch_for_revision(finfo->rcs, vers->tag);
- /* log this action */
- if (!start_audit_log_line("update")) {
- error(1, 0, "Out of memory");
+ if (!grant_file_permission(finfo->repository, branch, finfo->file,
+ branch_perm_checkout, "update")) {
+ return 0;
+ }
+
+ operation_audit_log("update", finfo, branch, vers->vn_rcs);
}
- append_audit_log_line(finfo->repository + Pserver_Repos_len + 1);
- append_audit_log_line(finfo->file);
- if (vers->tag == NULL)
- append_audit_log_line("");
- else
- append_audit_log_line(vers->tag);
- append_audit_log_line(vers->vn_rcs);
- log_audit_event();
-
+
#endif
/* Keep track of whether TAG is a branch tag.
|
|
From: Alexey M. <ty...@us...> - 2002-05-25 21:01:47
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv6637
Modified Files:
Tag: NCLI-1-11-1
Makefile.am Makefile.in
Log Message:
Forgot about audit.h
Index: Makefile.am
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Makefile.am,v
retrieving revision 1.1.1.1.2.6.2.23
retrieving revision 1.1.1.1.2.6.2.24
diff -u -d -r1.1.1.1.2.6.2.23 -r1.1.1.1.2.6.2.24
--- Makefile.am 25 May 2002 20:47:03 -0000 1.1.1.1.2.6.2.23
+++ Makefile.am 25 May 2002 21:01:44 -0000 1.1.1.1.2.6.2.24
@@ -36,7 +36,8 @@
add.c \
admin.c \
annotate.c \
- audit-log.h audit-log.c audit.c \
+ audit.h audit.c \
+ audit-log.h audit-log.c \
buffer.c \
checkin.c \
checkout.c \
Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Makefile.in,v
retrieving revision 1.1.1.3.2.7.2.24
retrieving revision 1.1.1.3.2.7.2.25
diff -u -d -r1.1.1.3.2.7.2.24 -r1.1.1.3.2.7.2.25
--- Makefile.in 25 May 2002 20:47:03 -0000 1.1.1.3.2.7.2.24
+++ Makefile.in 25 May 2002 21:01:44 -0000 1.1.1.3.2.7.2.25
@@ -126,7 +126,8 @@
add.c \
admin.c \
annotate.c \
- audit-log.h audit-log.c audit.c \
+ audit.h audit.c \
+ audit-log.h audit-log.c \
buffer.c \
checkin.c \
checkout.c \
@@ -329,7 +330,7 @@
chkpwd_audit_log_DEPENDENCIES = $(top_builddir)/acl/libcvsacl.a
chkpwd_audit_log_LDFLAGS =
am_cvs_OBJECTS = acl$U.$(OBJEXT) add$U.$(OBJEXT) admin$U.$(OBJEXT) \
- annotate$U.$(OBJEXT) audit-log$U.$(OBJEXT) audit$U.$(OBJEXT) \
+ annotate$U.$(OBJEXT) audit$U.$(OBJEXT) audit-log$U.$(OBJEXT) \
buffer$U.$(OBJEXT) checkin$U.$(OBJEXT) checkout$U.$(OBJEXT) \
classify$U.$(OBJEXT) commit$U.$(OBJEXT) create_adm$U.$(OBJEXT) \
cvs-server$U.$(OBJEXT) cvspasswd-file$U.$(OBJEXT) \
|
|
From: Alexey M. <ty...@us...> - 2002-05-25 20:59:53
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv5939
Modified Files:
Tag: NCLI-1-11-1
rcs.c rcs.h
Log Message:
branch_for_revision(): returns name of a branch
this revision (or tag) is on
Index: rcs.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/rcs.c,v
retrieving revision 1.1.1.7
retrieving revision 1.1.1.7.4.1
diff -u -d -r1.1.1.7 -r1.1.1.7.4.1
--- rcs.c 19 May 2001 12:05:05 -0000 1.1.1.7
+++ rcs.c 25 May 2002 20:59:50 -0000 1.1.1.7.4.1
@@ -8419,3 +8419,100 @@
}
return label;
}
+
+
+/*
+
+ Returns name of the branch which contains `rev' in the `rcs' file.
+
+ `rev' could be either numeric revision number or symbolic tag
+ (branch tag or simple tag).
+
+ Returns empty string for revisions which lie on the trunk.
+
+ Returns NULL if the tag is not known, or if something generally went
+ wrong.
+
+ */
+
+char*
+branch_for_revision (RCSNode* rcs, char* rev)
+{
+ Node* head, *cur;
+ int simple_tag = 0;
+ int all_numeric;
+ char* p;
+ char* orig_version;
+ char* version;
+ char* branch = NULL;
+ char* pZ;
+ char* pT;
+ char* magic = NULL;
+
+ /* see if the `rev' is all numeric */
+ all_numeric = 1;
+ for (p = rev; *p; p++) {
+ if (!isdigit(*p) && (*p != '.')) {
+ all_numeric = 0;
+ break;
+ }
+ }
+
+ /* don't call RCS_getversion if `rev' is all numeric */
+ if (all_numeric)
+ orig_version = rev;
+ else
+ orig_version = RCS_getversion(rcs, rev, NULL, 0, &simple_tag);
+
+ version = xstrdup(orig_version);
+ if (!version)
+ goto out;
+
+ /* revisions X.Y are always on a trunk */
+ if (numdots(version) == 1) {
+ branch = "";
+ goto out;
+ }
+
+ /* convert `version' (X.Y.Z.T) to a magic branch number (X.Y.0.Z) */
+ pT = strrchr(version, '.');
+ if (pT == NULL)
+ error(1, 0, "Internal error: version '%s' does not contain dots", version);
+ *pT++ = '\0';
+
+ pZ = strrchr(version, '.');
+ if (pZ == NULL)
+ error(1, 0, "Internal error: version '%s' does not contain enough dots", version);
+ *pZ++ = '\0';
+
+ /* "X.Y." + "." + "0" + "." + "Z" + '\0' */
+ magic = malloc(strlen(version) + 1 + 1 + 1 + strlen(pZ) + 1);
+ if (!magic)
+ goto out;
+ strcpy(magic, version);
+ strcat(magic, ".");
+ strcat(magic, "0"); /* FIXME: actually RCS_MAGIC_BRANCH should be used here */
+ strcat(magic, ".");
+ strcat(magic, pZ);
+
+ /* get a list of symbolic tags, including branches */
+ RCS_symbols(rcs);
+ if (rcs->symbols) {
+ head = rcs->symbols->list;
+ for (cur = head->next; cur != head; cur = cur->next) {
+ if (strcmp(magic, cur->data) == 0) {
+ branch = cur->key;
+ goto out;
+ }
+ }
+ }
+ if (branch == NULL)
+ error(1, 0, "Internal error: cannot find branch name of magic revision '%s'", magic);
+
+ out:
+ free(version);
+ free(magic);
+ return branch;
+}
+
+
Index: rcs.h
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/rcs.h,v
retrieving revision 1.1.1.4
retrieving revision 1.1.1.4.4.1
diff -u -d -r1.1.1.4 -r1.1.1.4.4.1
--- rcs.h 19 May 2001 12:05:07 -0000 1.1.1.4
+++ rcs.h 25 May 2002 20:59:50 -0000 1.1.1.4.4.1
@@ -242,6 +242,8 @@
char **, size_t *));
char *make_file_label PROTO ((char *, char *, RCSNode *));
+char* branch_for_revision (RCSNode* rcs, char* rev);
+
extern int preserve_perms;
/* From import.c. */
|
|
From: Alexey M. <ty...@us...> - 2002-05-25 20:57:06
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv5533
Modified Files:
Tag: NCLI-1-11-1
racl.c
Log Message:
Fix uninitilized variables
Index: racl.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/racl.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- racl.c 11 Jan 2002 13:53:41 -0000 1.1.2.4
+++ racl.c 25 May 2002 20:57:03 -0000 1.1.2.5
@@ -48,8 +48,8 @@
char *subcommand;
char *username;
char *perm;
- char *prefix;
- int grant;
+ char *prefix = "";
+ int grant = 0;
if (!is_acl_admin(CVS_Username))
error(1, 0, "%s is not allowed to manage ACLs", CVS_Username);
|
|
From: Alexey M. <ty...@us...> - 2002-05-25 20:55:33
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv5099
Modified Files:
Tag: NCLI-1-11-1
error.c
Log Message:
Support %s == NULL;
support %p
Index: error.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/error.c,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.5.4.1
diff -u -d -r1.1.1.5 -r1.1.1.5.4.1
--- error.c 19 May 2001 12:05:04 -0000 1.1.1.5
+++ error.c 25 May 2002 20:55:25 -0000 1.1.1.5.4.1
@@ -120,6 +120,7 @@
const char *p;
char *q;
char *str;
+ void* ptr;
int num;
long lnum;
unsigned int unum;
@@ -152,6 +153,8 @@
{
case 's':
str = va_arg (args, char *);
+ if (!str)
+ str = "(null)";
cvs_outerr (str, strlen (str));
break;
case 'd':
@@ -178,6 +181,11 @@
unum = va_arg (args, unsigned int);
sprintf (buf, "%x", unum);
cvs_outerr (buf, strlen (buf));
+ break;
+ case 'p':
+ ptr = va_arg (args, void*);
+ sprintf (buf, "%p", ptr);
+ cvs_outerr (buf, strlen(buf));
break;
case 'c':
ch = va_arg (args, int);
|
|
From: Alexey M. <ty...@us...> - 2002-05-25 20:52:23
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv4698
Modified Files:
Tag: NCLI-1-11-1
cvschkpw.c
Log Message:
Fix unsignedness warning
Index: cvschkpw.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/cvschkpw.c,v
retrieving revision 1.1.6.1.2.2
retrieving revision 1.1.6.1.2.3
diff -u -d -r1.1.6.1.2.2 -r1.1.6.1.2.3
--- cvschkpw.c 21 Apr 2002 12:45:39 -0000 1.1.6.1.2.2
+++ cvschkpw.c 25 May 2002 20:52:20 -0000 1.1.6.1.2.3
@@ -41,7 +41,7 @@
#define DEFAULT_ERR_PREFIX PSERVER_ERR_PREFIX
char up[513];
-int uplen;
+unsigned int uplen;
char *err_prefix = NULL;
@@ -52,8 +52,8 @@
char *buffer;
char *cvspasswd;
FILE *CVSPASSWD;
- int i;
- char *field_user, *field_password, *field_system_user = NULL;
+ unsigned int i;
+ char *field_user, *field_password = NULL, *field_system_user = NULL;
char *field_email, *field_gecos, *field_status;
int r;
char *username;
|
|
From: Alexey M. <ty...@us...> - 2002-05-25 20:51:04
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv4392
Modified Files:
Tag: NCLI-1-11-1
client.c
Log Message:
Make connect_to_forked_server() static: it is not exported
Index: client.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/client.c,v
retrieving revision 1.1.1.7.2.6.2.17
retrieving revision 1.1.1.7.2.6.2.18
diff -u -d -r1.1.1.7.2.6.2.17 -r1.1.1.7.2.6.2.18
--- client.c 9 May 2002 13:20:31 -0000 1.1.1.7.2.6.2.17
+++ client.c 25 May 2002 20:51:01 -0000 1.1.1.7.2.6.2.18
@@ -3416,7 +3416,7 @@
/* Connect to a forked server process. */
-void
+static void
connect_to_forked_server (tofdp, fromfdp)
int *tofdp, *fromfdp;
{
|
|
From: Alexey M. <ty...@us...> - 2002-05-25 20:50:10
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv4191
Modified Files:
Tag: NCLI-1-11-1
chkpwd-audit-log.c
Log Message:
Make variables static
Index: chkpwd-audit-log.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/chkpwd-audit-log.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- chkpwd-audit-log.c 25 May 2002 15:57:49 -0000 1.1.2.4
+++ chkpwd-audit-log.c 25 May 2002 20:50:07 -0000 1.1.2.5
@@ -33,8 +33,8 @@
#include "stringbuf.h"
/* command line options processing */
-int opt_log_success = -1;
-int opt_debug = 0;
+static int opt_log_success = -1;
+static int opt_debug = 0;
static const char* short_options = "fsVh";
@@ -48,7 +48,7 @@
};
-const char* usage =
+static const char* usage =
"Usage: chkpwd-audit-log --failure -- CHECKPASSWORD... chkpwd-audit-log --success -- prog...\n"
"\n"
"Call the logging helper specified by the CVS_LOGGING_HELPER environment variable\n"
@@ -60,7 +60,7 @@
" -h, --help\tDisplay this help and exit\n"
" -V, --version\tDisplay version number and exit\n";
-const char* version = "chkpwd-audit-log " VERSION;
+static const char* version = "chkpwd-audit-log " VERSION;
int
main (int argc, char** argv)
|
|
From: Alexey M. <ty...@us...> - 2002-05-25 20:49:15
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv3984
Modified Files:
Tag: NCLI-1-11-1
audit-log.h
Log Message:
Fix #ifndef-protection
Index: audit-log.h
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/audit-log.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- audit-log.h 25 May 2002 15:56:33 -0000 1.1.2.2
+++ audit-log.h 25 May 2002 20:49:12 -0000 1.1.2.3
@@ -16,7 +16,7 @@
*/
#ifndef AUDIT_LOG_H__
-#define AUDITO_LOG_H__ 1
+#define AUDIT_LOG_H__ 1
int start_logging_helper (const char* logging_helper);
|
|
From: Alexey M. <ty...@us...> - 2002-05-25 20:48:07
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv3621
Modified Files:
Tag: NCLI-1-11-1
audit-log.c
Log Message:
Add copyright header
Index: audit-log.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/audit-log.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- audit-log.c 25 May 2002 15:56:33 -0000 1.1.2.4
+++ audit-log.c 25 May 2002 20:48:05 -0000 1.1.2.5
@@ -1,3 +1,20 @@
+/*
+ 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 2, 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.
+
+ Copyright (c) Alexey Mahotkin <al...@hs...> 2002
+
+ Audit log handling routines
+
+*/
+
#include <config.h>
|
|
From: Alexey M. <ty...@us...> - 2002-05-25 20:47:06
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv3331
Modified Files:
Tag: NCLI-1-11-1
Makefile.am Makefile.in
Added Files:
Tag: NCLI-1-11-1
audit.c audit.h
Log Message:
separate file for operation_audit_log() routine:
not to clutter the linking of chkpwd-audit-log
--- NEW FILE: audit.c ---
/*
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 2, 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.
Copyright (c) Alexey Mahotkin <al...@hs...> 2002
Audit log handling routines (CVS server specific)
*/
#include <config.h>
#include "audit.h"
#include "audit-log.h"
int
operation_audit_log(const char* operation, struct file_info* finfo,
const char* branch, const char* rev)
{
if (!start_audit_log_line(operation)) {
error(1, 0, "Out of memory");
}
append_audit_log_line(finfo->repository + Pserver_Repos_len + 1);
append_audit_log_line(finfo->file);
if (branch == NULL)
append_audit_log_line("");
else
append_audit_log_line(branch);
if (rev == NULL)
append_audit_log_line("");
else
append_audit_log_line(rev);
log_audit_event();
return 1;
}
--- NEW FILE: audit.h ---
/*
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 2, 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.
Copyright (c) Alexey Mahotkin <al...@hs...> 2002
Audit log handling routines
*/
#ifndef AUDIT_H__
#define AUDIT_H__ 1
#include "cvs.h"
int operation_audit_log(const char* operation, struct file_info* finfo, const char* branch, const char* rev);
#endif /* AUDIT_H__ */
Index: Makefile.am
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Makefile.am,v
retrieving revision 1.1.1.1.2.6.2.22
retrieving revision 1.1.1.1.2.6.2.23
diff -u -d -r1.1.1.1.2.6.2.22 -r1.1.1.1.2.6.2.23
--- Makefile.am 23 May 2002 23:17:15 -0000 1.1.1.1.2.6.2.22
+++ Makefile.am 25 May 2002 20:47:03 -0000 1.1.1.1.2.6.2.23
@@ -36,7 +36,7 @@
add.c \
admin.c \
annotate.c \
- audit-log.h audit-log.c \
+ audit-log.h audit-log.c audit.c \
buffer.c \
checkin.c \
checkout.c \
Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Makefile.in,v
retrieving revision 1.1.1.3.2.7.2.23
retrieving revision 1.1.1.3.2.7.2.24
diff -u -d -r1.1.1.3.2.7.2.23 -r1.1.1.3.2.7.2.24
--- Makefile.in 23 May 2002 23:17:15 -0000 1.1.1.3.2.7.2.23
+++ Makefile.in 25 May 2002 20:47:03 -0000 1.1.1.3.2.7.2.24
@@ -126,7 +126,7 @@
add.c \
admin.c \
annotate.c \
- audit-log.h audit-log.c \
+ audit-log.h audit-log.c audit.c \
buffer.c \
checkin.c \
checkout.c \
@@ -329,9 +329,9 @@
chkpwd_audit_log_DEPENDENCIES = $(top_builddir)/acl/libcvsacl.a
chkpwd_audit_log_LDFLAGS =
am_cvs_OBJECTS = acl$U.$(OBJEXT) add$U.$(OBJEXT) admin$U.$(OBJEXT) \
- annotate$U.$(OBJEXT) audit-log$U.$(OBJEXT) buffer$U.$(OBJEXT) \
- checkin$U.$(OBJEXT) checkout$U.$(OBJEXT) classify$U.$(OBJEXT) \
- commit$U.$(OBJEXT) create_adm$U.$(OBJEXT) \
+ annotate$U.$(OBJEXT) audit-log$U.$(OBJEXT) audit$U.$(OBJEXT) \
+ buffer$U.$(OBJEXT) checkin$U.$(OBJEXT) checkout$U.$(OBJEXT) \
+ classify$U.$(OBJEXT) commit$U.$(OBJEXT) create_adm$U.$(OBJEXT) \
cvs-server$U.$(OBJEXT) cvspasswd-file$U.$(OBJEXT) \
cvsrc$U.$(OBJEXT) diff$U.$(OBJEXT) edit$U.$(OBJEXT) \
entries$U.$(OBJEXT) env$U.$(OBJEXT) error$U.$(OBJEXT) \
@@ -388,8 +388,9 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/acl$U.Po $(DEPDIR)/add$U.Po \
@AMDEP_TRUE@ $(DEPDIR)/admin$U.Po $(DEPDIR)/annotate$U.Po \
-@AMDEP_TRUE@ $(DEPDIR)/audit-log$U.Po $(DEPDIR)/buffer$U.Po \
-@AMDEP_TRUE@ $(DEPDIR)/checkin$U.Po $(DEPDIR)/checkout$U.Po \
+@AMDEP_TRUE@ $(DEPDIR)/audit$U.Po $(DEPDIR)/audit-log$U.Po \
+@AMDEP_TRUE@ $(DEPDIR)/buffer$U.Po $(DEPDIR)/checkin$U.Po \
+@AMDEP_TRUE@ $(DEPDIR)/checkout$U.Po \
@AMDEP_TRUE@ $(DEPDIR)/chkpwd-audit-log$U.Po \
@AMDEP_TRUE@ $(DEPDIR)/classify$U.Po $(DEPDIR)/client$U.Po \
@AMDEP_TRUE@ $(DEPDIR)/client_nserver_auth$U.Po \
@@ -586,6 +587,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/add$U.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/admin$U.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/annotate$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/audit$U.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/audit-log$U.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/buffer$U.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/checkin$U.Po@am__quote@
@@ -692,6 +694,8 @@
$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/admin.c; then echo $(srcdir)/admin.c; else echo admin.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > admin_.c || rm -f admin_.c
annotate_.c: annotate.c $(ANSI2KNR)
$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/annotate.c; then echo $(srcdir)/annotate.c; else echo annotate.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > annotate_.c || rm -f annotate_.c
+audit_.c: audit.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/audit.c; then echo $(srcdir)/audit.c; else echo audit.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > audit_.c || rm -f audit_.c
audit-log_.c: audit-log.c $(ANSI2KNR)
$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/audit-log.c; then echo $(srcdir)/audit-log.c; else echo audit-log.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > audit-log_.c || rm -f audit-log_.c
buffer_.c: buffer.c $(ANSI2KNR)
@@ -857,9 +861,9 @@
zlib-client_.c: zlib-client.c $(ANSI2KNR)
$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/zlib-client.c; then echo $(srcdir)/zlib-client.c; else echo zlib-client.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > zlib-client_.c || rm -f zlib-client_.c
acl_.$(OBJEXT) add_.$(OBJEXT) admin_.$(OBJEXT) annotate_.$(OBJEXT) \
-audit-log_.$(OBJEXT) buffer_.$(OBJEXT) checkin_.$(OBJEXT) \
-checkout_.$(OBJEXT) chkpwd-audit-log_.$(OBJEXT) classify_.$(OBJEXT) \
-client_.$(OBJEXT) client_nserver_auth_.$(OBJEXT) \
+audit_.$(OBJEXT) audit-log_.$(OBJEXT) buffer_.$(OBJEXT) \
+checkin_.$(OBJEXT) checkout_.$(OBJEXT) chkpwd-audit-log_.$(OBJEXT) \
+classify_.$(OBJEXT) client_.$(OBJEXT) client_nserver_auth_.$(OBJEXT) \
client_pserver_auth_.$(OBJEXT) commit_.$(OBJEXT) create_adm_.$(OBJEXT) \
cvs-nserver_.$(OBJEXT) cvs-pserver_.$(OBJEXT) cvs-server_.$(OBJEXT) \
cvschkpw_.$(OBJEXT) cvspasswd_.$(OBJEXT) cvspasswd-file_.$(OBJEXT) \
|
|
From: Alexey M. <ty...@us...> - 2002-05-25 20:41:43
|
Update of /cvsroot/cvs-nserver/cvs-nserver/acl
In directory usw-pr-cvs1:/tmp/cvs-serv2461
Modified Files:
Tag: NCLI-1-11-1
stringbuf.c stringbuf.h
Log Message:
Add `const' qualifiers
Index: stringbuf.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/stringbuf.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- stringbuf.c 9 May 2002 15:09:12 -0000 1.1.2.6
+++ stringbuf.c 25 May 2002 20:41:38 -0000 1.1.2.7
@@ -14,7 +14,7 @@
#endif
struct stringbuf *
-new_stringbuf (char *str)
+new_stringbuf (const char *str)
{
struct stringbuf *sb;
size_t allocated;
@@ -104,7 +104,7 @@
}
struct stringbuf *
-cat_stringbuf (struct stringbuf *buf, char *str)
+cat_stringbuf (struct stringbuf *buf, const char *str)
{
size_t len;
Index: stringbuf.h
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/stringbuf.h,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- stringbuf.h 9 May 2002 15:09:12 -0000 1.1.2.4
+++ stringbuf.h 25 May 2002 20:41:39 -0000 1.1.2.5
@@ -3,7 +3,7 @@
#define STRINGBUF_H 1
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
/* stdlib.h includes stddef.h which in turn defines size_t */
@@ -19,7 +19,7 @@
typedef struct stringbuf stringbuf;
-struct stringbuf *new_stringbuf (char *str);
+struct stringbuf *new_stringbuf (const char *str);
void free_stringbuf (struct stringbuf *buf);
@@ -27,7 +27,7 @@
struct stringbuf *catc_stringbuf (struct stringbuf *buf, char c);
-struct stringbuf *cat_stringbuf (struct stringbuf *buf, char *str);
+struct stringbuf *cat_stringbuf (struct stringbuf *buf, const char *str);
struct stringbuf *shrink_stringbuf (struct stringbuf *buf, size_t newlen);
|
|
From: Alexey M. <ty...@us...> - 2002-05-25 16:07:24
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv4560
Modified Files:
Tag: NCLI-1-11-1
cvs-server.h fd.h
Log Message:
Tiny fixes
Index: cvs-server.h
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/cvs-server.h,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.1.2.1
diff -u -d -r1.1.6.1 -r1.1.6.1.2.1
--- cvs-server.h 26 May 2001 14:26:23 -0000 1.1.6.1
+++ cvs-server.h 25 May 2002 16:07:21 -0000 1.1.6.1.2.1
@@ -18,8 +18,6 @@
#ifndef CVS_SERVER_H
#define CVS_SERVER_H
-#include "fd.h"
-
char *get_buffer (char *buf, int bufsize);
char* strip_trailing_slash (char *repository);
Index: fd.h
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/fd.h,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.1.2.1
diff -u -d -r1.1.6.1 -r1.1.6.1.2.1
--- fd.h 26 May 2001 14:26:23 -0000 1.1.6.1
+++ fd.h 25 May 2002 16:07:21 -0000 1.1.6.1.2.1
@@ -2,6 +2,5 @@
#define FD_H
extern int fd_copy(int to, int from);
-extern int fd_move(int to, int from);
#endif
|
|
From: Alexey M. <ty...@us...> - 2002-05-25 15:58:40
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv1528
Modified Files:
Tag: NCLI-1-11-1
update.c
Log Message:
Log updates
Index: update.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/update.c,v
retrieving revision 1.1.1.6.4.5
retrieving revision 1.1.1.6.4.6
diff -u -d -r1.1.1.6.4.5 -r1.1.1.6.4.6
--- update.c 10 Mar 2002 02:37:38 -0000 1.1.1.6.4.5
+++ update.c 25 May 2002 15:58:36 -0000 1.1.1.6.4.6
@@ -39,6 +39,7 @@
#include "md5.h"
#endif
#include "acl.h"
+#include "audit-log.h"
#include "watch.h"
#include "fileattr.h"
#include "edit.h"
@@ -601,6 +602,20 @@
if (!grant_file_permission(finfo->repository, vers->tag, finfo->file,
branch_perm_checkout, "update"))
return 0;
+
+ /* log this action */
+ if (!start_audit_log_line("update")) {
+ error(1, 0, "Out of memory");
+ }
+ append_audit_log_line(finfo->repository + Pserver_Repos_len + 1);
+ append_audit_log_line(finfo->file);
+ if (vers->tag == NULL)
+ append_audit_log_line("");
+ else
+ append_audit_log_line(vers->tag);
+ append_audit_log_line(vers->vn_rcs);
+ log_audit_event();
+
#endif
/* Keep track of whether TAG is a branch tag.
|
|
From: Alexey M. <ty...@us...> - 2002-05-25 15:57:54
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv1262
Modified Files:
Tag: NCLI-1-11-1
chkpwd-audit-log.c
Log Message:
Update to reflect changes in audit-log.[ch]
Index: chkpwd-audit-log.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/chkpwd-audit-log.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- chkpwd-audit-log.c 23 May 2002 23:13:27 -0000 1.1.2.3
+++ chkpwd-audit-log.c 25 May 2002 15:57:49 -0000 1.1.2.4
@@ -27,7 +27,6 @@
#include <string.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <time.h>
#include <unistd.h>
#include "audit-log.h"
@@ -67,13 +66,7 @@
main (int argc, char** argv)
{
char* logging_helper;
- struct stringbuf* auth_line;
- char timestamp[16];
- char pid_as_string[16];
int pid;
- char* ip_address;
- char* repository;
- char* username;
/* process command-line options */
opterr = 0;
@@ -139,44 +132,9 @@
exit(2);
}
- auth_line = new_stringbuf("auth ");
- if (!auth_line)
+ if (!start_audit_log_line("auth"))
goto nomem;
- /* timestamp */
- snprintf(timestamp, sizeof(timestamp) - 1, "%lu", (unsigned long) time(NULL));
- cat_stringbuf(auth_line, timestamp);
- catc_stringbuf(auth_line, ' ');
-
- /* pid */
- snprintf(pid_as_string, sizeof(pid_as_string) - 1, "%u", (unsigned int) getpid());
- cat_stringbuf(auth_line, pid_as_string);
- catc_stringbuf(auth_line, ' ');
-
- /* IP address */
- ip_address = get_client_ip_address();
- if (!ip_address) {
- fprintf(stderr, "Error getting client IP address: %s\n", strerror(errno));
- exit(111);
- }
- cat_stringbuf(auth_line, ip_address);
- catc_stringbuf(auth_line, ' ');
-
- /* repository*/
- /* we are running under the cvs-pserver, so the $REPOSITORY is always set */
- repository = getenv("REPOSITORY");
- if (repository == NULL)
- repository = "***UNKNOWN***";
- cat_stringbuf(auth_line, repository);
- catc_stringbuf(auth_line, ' ');
-
- /* username */
- username = getenv("CVSUSER");
- if (username == NULL)
- username = "***UNKNOWN***";
- cat_stringbuf(auth_line, username);
- catc_stringbuf(auth_line, ' ');
-
/*
Order of logging the event and running the program (which is
@@ -195,8 +153,8 @@
*/
if (opt_log_success) {
- cat_stringbuf(auth_line, "success");
- log_audit_event(auth_line->buf);
+ append_audit_log_line("success");
+ log_audit_event();
}
pid = fork();
@@ -219,8 +177,8 @@
} else {
/* if checkpassword returned 1 */
if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
- cat_stringbuf(auth_line, "failure");
- log_audit_event(auth_line->buf);
+ append_audit_log_line("failure");
+ log_audit_event();
}
exit(WEXITSTATUS(status));
}
|
