cvs-nserver-commits Mailing List for CVS with rewritten network layer (Page 18)
Brought to you by:
tyranny
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...> - 2001-08-26 20:44:05
|
Update of /cvsroot/cvs-nserver/cvs-nserver/acl In directory usw-pr-cvs1:/tmp/cvs-serv625 Added Files: Tag: NCLI-1-11-1 check_acl.c Log Message: Test-case for ACL implementation --- NEW FILE: check_acl.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...> 2001 Test-suite for Access Control Lists */ #include "acl.h" #include <assert.h> #include <stdlib.h> int main (int argc, char *argv[]) { DIR_ACL *topdir_acl = start_acl_traverse("/tmp/acl-test"); assert(topdir_acl != NULL); check_reading(topdir_acl, "foo"); } |
From: Alexey M. <ty...@us...> - 2001-08-26 20:43:38
|
Update of /cvsroot/cvs-nserver/cvs-nserver/acl In directory usw-pr-cvs1:/tmp/cvs-serv527 Added Files: Tag: NCLI-1-11-1 Makefile.in Makefile.am Log Message: Simple infrastructure for ACL library --- NEW FILE: Makefile.in --- # Makefile.in generated automatically by automake 1.4f 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@ 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@ CPP = @CPP@ CSH = @CSH@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KRB4 = @KRB4@ LN_S = @LN_S@ MAINT = @MAINT@ PACKAGE = @PACKAGE@ PERL = @PERL@ PR = @PR@ PS2PDF = @PS2PDF@ RANLIB = @RANLIB@ ROFF = @ROFF@ TEXI2DVI = @TEXI2DVI@ U = @U@ VERSION = @VERSION@ YACC = @YACC@ _am_include = @_am_include@ _am_quote = @_am_quote@ enable_setuid = @enable_setuid@ includeopt = @includeopt@ install_sh = @install_sh@ setuid_group = @setuid_group@ setuid_user = @setuid_user@ ssl_client_objects = @ssl_client_objects@ AUTOMAKE_OPTIONS = ../lib/ansi2knr TESTS = check_acl noinst_PROGRAMS = check_acl check_acl_SOURCES = check_acl.c acl.h acl.c EXEEXT = OBJEXT = o subdir = acl mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/src/options.h CONFIG_CLEAN_FILES = noinst_PROGRAMS = check_acl$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) am_check_acl_OBJECTS = check_acl$U.$(OBJEXT) acl$U.$(OBJEXT) check_acl_OBJECTS = $(am_check_acl_OBJECTS) check_acl_LDADD = $(LDADD) check_acl_DEPENDENCIES = check_acl_LDFLAGS = DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/src CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/depcomp @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/acl$U.Po $(DEPDIR)/check_acl$U.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 = $(check_acl_SOURCES) DIST_COMMON = Makefile.am Makefile.in SOURCES = $(check_acl_SOURCES) all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu acl/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status clean-noinstPROGRAMS: -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) check_acl$(EXEEXT): $(check_acl_OBJECTS) $(check_acl_DEPENDENCIES) @rm -f check_acl$(EXEEXT) $(LINK) $(check_acl_LDFLAGS) $(check_acl_OBJECTS) $(check_acl_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c ANSI2KNR = ../lib/ansi2knr ../lib/ansi2knr: cd ../lib && $(MAKE) $(AM_MAKEFLAGS) ansi2knr mostlyclean-kr: -rm -f *_.c @AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/acl$U.Po@_am_quote@ @AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/check_acl$U.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@ acl_.c: acl.c $(ANSI2KNR) $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/acl.c; then echo $(srcdir)/acl.c; else echo acl.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > acl_.c || rm -f acl_.c check_acl_.c: check_acl.c $(ANSI2KNR) $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/check_acl.c; then echo $(srcdir)/check_acl.c; else echo check_acl.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > check_acl_.c || rm -f check_acl_.c acl_.$(OBJEXT) check_acl_.$(OBJEXT) : $(ANSI2KNR) 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) $(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)$$unique$(LISP)$$tags" \ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) GTAGS: here=`CDPATH=: && cd $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $$here distclean-tags: -rm -f TAGS ID check-TESTS: $(TESTS) @failed=0; all=0; xfail=0; xpass=0; \ srcdir=$(srcdir); export srcdir; \ list='$(TESTS)'; \ if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ elif test -f $$tst; then dir=; \ else dir="$(srcdir)/"; fi; \ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ *" $$tst "*) \ xpass=`expr $$xpass + 1`; \ failed=`expr $$failed + 1`; \ echo "XPASS: $$tst"; \ ;; \ *) \ echo "PASS: $$tst"; \ ;; \ esac; \ elif test $$? -ne 77; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ *" $$tst "*) \ xfail=`expr $$xfail + 1`; \ echo "XFAIL: $$tst"; \ ;; \ *) \ failed=`expr $$failed + 1`; \ echo "FAIL: $$tst"; \ ;; \ esac; \ fi; \ done; \ if test "$$failed" -eq 0; then \ if test "$$xfail" -eq 0; then \ banner="All $$all tests passed"; \ else \ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ fi; \ else \ if test "$$xpass" -eq 0; then \ banner="$$failed of $$all tests failed"; \ else \ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ fi; \ fi; \ dashes=`echo "$$banner" | sed s/./=/g`; \ echo "$$dashes"; \ echo "$$banner"; \ echo "$$dashes"; \ test "$$failed" -eq 0; \ fi DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @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 check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am all-am: Makefile $(PROGRAMS) installdirs: 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-generic clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am distclean-am: clean-am distclean-compile distclean-depend \ distclean-generic distclean-tags dvi: dvi-am dvi-am: info: info-am info-am: install-data-am: install-exec-am: 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 mostlyclean-kr uninstall-am: uninstall-info-am uninstall-info: uninstall-info-am .PHONY: all all-am check check-TESTS check-am clean clean-generic \ clean-noinstPROGRAMS distclean distclean-compile \ distclean-depend distclean-generic distclean-tags distdir dvi \ dvi-am info info-am install install-am 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 mostlyclean-kr tags uninstall uninstall-am \ 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: Makefile.am --- AUTOMAKE_OPTIONS = ../lib/ansi2knr TESTS = check_acl noinst_PROGRAMS = check_acl check_acl_SOURCES = check_acl.c acl.h acl.c |
From: Alexey M. <ty...@us...> - 2001-08-26 20:00:37
|
Update of /cvsroot/cvs-nserver/cvs-nserver/acl In directory usw-pr-cvs1:/tmp/cvs-serv24593/acl Log Message: Directory /cvsroot/cvs-nserver/cvs-nserver/acl added to the repository --> Using per-directory sticky tag `NCLI-1-11-1' |
From: Alexey M. <ty...@us...> - 2001-08-26 19:21:56
|
Update of /cvsroot/cvs-nserver/cvs-nserver/windows-NT/SCC In directory usw-pr-cvs1:/tmp/cvs-serv16275/windows-NT/SCC Modified Files: Tag: NCLI-1-11-1 Makefile.in Log Message: Added ansi2knr to options; bumped up required Automake version number Index: Makefile.in =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/windows-NT/SCC/Makefile.in,v retrieving revision 1.1.1.3.2.3.2.1 retrieving revision 1.1.1.3.2.3.2.2 diff -u -d -r1.1.1.3.2.3.2.1 -r1.1.1.3.2.3.2.2 --- Makefile.in 2001/08/19 19:28:34 1.1.1.3.2.3.2.1 +++ Makefile.in 2001/08/26 19:21:53 1.1.1.3.2.3.2.2 @@ -75,6 +75,7 @@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ +CPP = @CPP@ CSH = @CSH@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ @@ -87,6 +88,7 @@ RANLIB = @RANLIB@ ROFF = @ROFF@ TEXI2DVI = @TEXI2DVI@ +U = @U@ VERSION = @VERSION@ YACC = @YACC@ _am_include = @_am_include@ |
From: Alexey M. <ty...@us...> - 2001-08-26 19:21:56
|
Update of /cvsroot/cvs-nserver/cvs-nserver In directory usw-pr-cvs1:/tmp/cvs-serv16275 Modified Files: Tag: NCLI-1-11-1 Makefile.am Makefile.in aclocal.m4 config.h.in configure configure.in Log Message: Added ansi2knr to options; bumped up required Automake version number Index: Makefile.am =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/Makefile.am,v retrieving revision 1.1.1.1.2.4.2.1 retrieving revision 1.1.1.1.2.4.2.2 diff -u -d -r1.1.1.1.2.4.2.1 -r1.1.1.1.2.4.2.2 --- Makefile.am 2001/08/15 21:24:43 1.1.1.1.2.4.2.1 +++ Makefile.am 2001/08/26 19:21:52 1.1.1.1.2.4.2.2 @@ -12,7 +12,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -AUTOMAKE_OPTIONS = 1.4a dist-bzip2 +AUTOMAKE_OPTIONS = 1.4f dist-bzip2 ## Subdirectories to run make in for the primary targets. # Unix source subdirs, where we'll want to run lint and etags: Index: Makefile.in =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/Makefile.in,v retrieving revision 1.1.1.4.2.5.2.2 retrieving revision 1.1.1.4.2.5.2.3 diff -u -d -r1.1.1.4.2.5.2.2 -r1.1.1.4.2.5.2.3 --- Makefile.in 2001/08/19 19:28:33 1.1.1.4.2.5.2.2 +++ Makefile.in 2001/08/26 19:21:52 1.1.1.4.2.5.2.3 @@ -71,6 +71,7 @@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ +CPP = @CPP@ CSH = @CSH@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ @@ -83,6 +84,7 @@ RANLIB = @RANLIB@ ROFF = @ROFF@ TEXI2DVI = @TEXI2DVI@ +U = @U@ VERSION = @VERSION@ YACC = @YACC@ _am_include = @_am_include@ @@ -94,7 +96,7 @@ setuid_user = @setuid_user@ ssl_client_objects = @ssl_client_objects@ -AUTOMAKE_OPTIONS = 1.4a dist-bzip2 +AUTOMAKE_OPTIONS = 1.4f dist-bzip2 # Unix source subdirs, where we'll want to run lint and etags: # This is a legacy variable from b4 Automake Index: aclocal.m4 =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/aclocal.m4,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.1.2.1 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.1.2.1 --- aclocal.m4 2001/05/26 12:43:01 1.1.1.1.2.1 +++ aclocal.m4 2001/08/26 19:21:52 1.1.1.1.2.1.2.1 @@ -736,3 +736,114 @@ done]) ]) + +# serial 1 + +AC_DEFUN([AM_C_PROTOTYPES], +[AC_REQUIRE([AM_PROG_CC_STDC]) +AC_REQUIRE([AC_PROG_CPP]) +AC_MSG_CHECKING([for function prototypes]) +if test "$am_cv_prog_cc_stdc" != no; then + AC_MSG_RESULT(yes) + AC_DEFINE(PROTOTYPES,1,[Define if compiler has function prototypes]) + U= ANSI2KNR= +else + AC_MSG_RESULT(no) + U=_ ANSI2KNR=./ansi2knr +fi +# Ensure some checks needed by ansi2knr itself. +AC_HEADER_STDC +AC_CHECK_HEADERS(string.h) +AC_SUBST(U)dnl +AC_SUBST(ANSI2KNR)dnl +]) + + +# serial 1 + +# @defmac AC_PROG_CC_STDC +# @maindex PROG_CC_STDC +# @ovindex CC +# If the C compiler in not in ANSI C mode by default, try to add an option +# to output variable @code{CC} to make it so. This macro tries various +# options that select ANSI C on some system or another. It considers the +# compiler to be in ANSI C mode if it handles function prototypes correctly. +# +# If you use this macro, you should check after calling it whether the C +# compiler has been set to accept ANSI C; if not, the shell variable +# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source +# code in ANSI C, you can make an un-ANSIfied copy of it by using the +# program @code{ansi2knr}, which comes with Ghostscript. +# @end defmac + +AC_DEFUN([AM_PROG_CC_STDC], +[AC_REQUIRE([AC_PROG_CC]) +AC_BEFORE([$0], [AC_C_INLINE]) +AC_BEFORE([$0], [AC_C_CONST]) +dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require +dnl a magic option to avoid problems with ANSI preprocessor commands +dnl like #elif. +dnl FIXME: can't do this because then AC_AIX won't work due to a +dnl circular dependency. +dnl AC_BEFORE([$0], [AC_PROG_CPP]) +AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C]) +AC_CACHE_VAL(am_cv_prog_cc_stdc, +[am_cv_prog_cc_stdc=no +ac_save_CC="$CC" +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + AC_TRY_COMPILE( +[#include <stdarg.h> +#include <stdio.h> +#include <sys/types.h> +#include <sys/stat.h> +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +], [ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +], +[am_cv_prog_cc_stdc="$ac_arg"; break]) +done +CC="$ac_save_CC" +]) +if test -z "$am_cv_prog_cc_stdc"; then + AC_MSG_RESULT([none needed]) +else + AC_MSG_RESULT([$am_cv_prog_cc_stdc]) +fi +case "x$am_cv_prog_cc_stdc" in + x|xno) ;; + *) CC="$CC $am_cv_prog_cc_stdc" ;; +esac +]) + Index: config.h.in =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/config.h.in,v retrieving revision 1.1.1.3.2.3.2.1 retrieving revision 1.1.1.3.2.3.2.2 diff -u -d -r1.1.1.3.2.3.2.1 -r1.1.1.3.2.3.2.2 --- config.h.in 2001/08/19 19:28:33 1.1.1.3.2.3.2.1 +++ config.h.in 2001/08/26 19:21:52 1.1.1.3.2.3.2.2 @@ -338,6 +338,9 @@ /* Path to the pr utility */ #undef PR_PROGRAM +/* Define if compiler has function prototypes */ +#undef PROTOTYPES + /* Define if you have GSSAPI with Kerberos version 5 available. */ #undef HAVE_GSSAPI Index: configure =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/configure,v retrieving revision 1.1.1.6.2.9.2.3 retrieving revision 1.1.1.6.2.9.2.4 diff -u -d -r1.1.1.6.2.9.2.3 -r1.1.1.6.2.9.2.4 --- configure 2001/08/19 19:28:33 1.1.1.6.2.9.2.3 +++ configure 2001/08/26 19:21:52 1.1.1.6.2.9.2.4 @@ -1922,17 +1922,260 @@ LIBS="-lcrypt $LIBS" fi + + + +echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 +echo "configure:1930: checking for ${CC-cc} option to accept ANSI C" >&5 +if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else [...2016 lines suppressed...] #include "confdefs.h" int main() { return __CYGWIN32__; ; return 0; } EOF -if { (eval echo configure:5296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ccvs_cv_sys_cygwin32=yes else @@ -5524,6 +5767,8 @@ s%@TEXI2DVI@%$TEXI2DVI%g s%@MAKE_TARGETS_IN_VPATH_TRUE@%$MAKE_TARGETS_IN_VPATH_TRUE%g s%@MAKE_TARGETS_IN_VPATH_FALSE@%$MAKE_TARGETS_IN_VPATH_FALSE%g +s%@U@%$U%g +s%@ANSI2KNR@%$ANSI2KNR%g s%@LIBOBJS@%$LIBOBJS%g s%@KRB4@%$KRB4%g s%@includeopt@%$includeopt%g Index: configure.in =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/configure.in,v retrieving revision 1.1.1.6.2.9.2.3 retrieving revision 1.1.1.6.2.9.2.4 diff -u -d -r1.1.1.6.2.9.2.3 -r1.1.1.6.2.9.2.4 --- configure.in 2001/08/19 19:28:34 1.1.1.6.2.9.2.3 +++ configure.in 2001/08/26 19:21:53 1.1.1.6.2.9.2.4 @@ -74,6 +74,8 @@ LIBS="-lcrypt $LIBS" fi +AM_C_PROTOTYPES + AC_HEADER_DIRENT AC_HEADER_STDC AC_HEADER_SYS_WAIT |
From: Alexey M. <ty...@us...> - 2001-08-26 19:21:56
|
Update of /cvsroot/cvs-nserver/cvs-nserver/vms In directory usw-pr-cvs1:/tmp/cvs-serv16275/vms Modified Files: Tag: NCLI-1-11-1 Makefile.in Log Message: Added ansi2knr to options; bumped up required Automake version number Index: Makefile.in =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/vms/Makefile.in,v retrieving revision 1.1.1.2.2.3.2.1 retrieving revision 1.1.1.2.2.3.2.2 diff -u -d -r1.1.1.2.2.3.2.1 -r1.1.1.2.2.3.2.2 --- Makefile.in 2001/08/19 19:28:34 1.1.1.2.2.3.2.1 +++ Makefile.in 2001/08/26 19:21:53 1.1.1.2.2.3.2.2 @@ -75,6 +75,7 @@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ +CPP = @CPP@ CSH = @CSH@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ @@ -87,6 +88,7 @@ RANLIB = @RANLIB@ ROFF = @ROFF@ TEXI2DVI = @TEXI2DVI@ +U = @U@ VERSION = @VERSION@ YACC = @YACC@ _am_include = @_am_include@ |
From: Alexey M. <ty...@us...> - 2001-08-26 19:21:56
|
Update of /cvsroot/cvs-nserver/cvs-nserver/windows-NT In directory usw-pr-cvs1:/tmp/cvs-serv16275/windows-NT Modified Files: Tag: NCLI-1-11-1 Makefile.in Log Message: Added ansi2knr to options; bumped up required Automake version number Index: Makefile.in =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/windows-NT/Makefile.in,v retrieving revision 1.1.1.2.2.3.2.1 retrieving revision 1.1.1.2.2.3.2.2 diff -u -d -r1.1.1.2.2.3.2.1 -r1.1.1.2.2.3.2.2 --- Makefile.in 2001/08/19 19:28:34 1.1.1.2.2.3.2.1 +++ Makefile.in 2001/08/26 19:21:53 1.1.1.2.2.3.2.2 @@ -75,6 +75,7 @@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ +CPP = @CPP@ CSH = @CSH@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ @@ -87,6 +88,7 @@ RANLIB = @RANLIB@ ROFF = @ROFF@ TEXI2DVI = @TEXI2DVI@ +U = @U@ VERSION = @VERSION@ YACC = @YACC@ _am_include = @_am_include@ |
From: Alexey M. <ty...@us...> - 2001-08-26 19:21:56
|
Update of /cvsroot/cvs-nserver/cvs-nserver/man In directory usw-pr-cvs1:/tmp/cvs-serv16275/man Modified Files: Tag: NCLI-1-11-1 Makefile.in Log Message: Added ansi2knr to options; bumped up required Automake version number Index: Makefile.in =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/man/Makefile.in,v retrieving revision 1.1.1.4.2.3.2.2 retrieving revision 1.1.1.4.2.3.2.3 diff -u -d -r1.1.1.4.2.3.2.2 -r1.1.1.4.2.3.2.3 --- Makefile.in 2001/08/19 19:28:34 1.1.1.4.2.3.2.2 +++ Makefile.in 2001/08/26 19:21:53 1.1.1.4.2.3.2.3 @@ -71,6 +71,7 @@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ +CPP = @CPP@ CSH = @CSH@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ @@ -83,6 +84,7 @@ RANLIB = @RANLIB@ ROFF = @ROFF@ TEXI2DVI = @TEXI2DVI@ +U = @U@ VERSION = @VERSION@ YACC = @YACC@ _am_include = @_am_include@ |
From: Alexey M. <ty...@us...> - 2001-08-26 19:21:56
|
Update of /cvsroot/cvs-nserver/cvs-nserver/tools In directory usw-pr-cvs1:/tmp/cvs-serv16275/tools Modified Files: Tag: NCLI-1-11-1 Makefile.in Log Message: Added ansi2knr to options; bumped up required Automake version number Index: Makefile.in =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/tools/Makefile.in,v retrieving revision 1.1.1.2.2.3.2.1 retrieving revision 1.1.1.2.2.3.2.2 diff -u -d -r1.1.1.2.2.3.2.1 -r1.1.1.2.2.3.2.2 --- Makefile.in 2001/08/19 19:28:34 1.1.1.2.2.3.2.1 +++ Makefile.in 2001/08/26 19:21:53 1.1.1.2.2.3.2.2 @@ -72,6 +72,7 @@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ +CPP = @CPP@ CSH = @CSH@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ @@ -84,6 +85,7 @@ RANLIB = @RANLIB@ ROFF = @ROFF@ TEXI2DVI = @TEXI2DVI@ +U = @U@ VERSION = @VERSION@ YACC = @YACC@ _am_include = @_am_include@ |
From: Alexey M. <ty...@us...> - 2001-08-26 19:21:56
|
Update of /cvsroot/cvs-nserver/cvs-nserver/lib In directory usw-pr-cvs1:/tmp/cvs-serv16275/lib Modified Files: Tag: NCLI-1-11-1 Makefile.in Log Message: Added ansi2knr to options; bumped up required Automake version number Index: Makefile.in =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/lib/Makefile.in,v retrieving revision 1.1.1.4.2.3.2.1 retrieving revision 1.1.1.4.2.3.2.2 diff -u -d -r1.1.1.4.2.3.2.1 -r1.1.1.4.2.3.2.2 --- Makefile.in 2001/08/19 19:28:34 1.1.1.4.2.3.2.1 +++ Makefile.in 2001/08/26 19:21:53 1.1.1.4.2.3.2.2 @@ -84,6 +84,7 @@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ +CPP = @CPP@ CSH = @CSH@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ @@ -96,6 +97,7 @@ RANLIB = @RANLIB@ ROFF = @ROFF@ TEXI2DVI = @TEXI2DVI@ +U = @U@ VERSION = @VERSION@ YACC = @YACC@ _am_include = @_am_include@ @@ -196,9 +198,10 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ CFLAGS = @CFLAGS@ DIST_SOURCES = $(libcvs_a_SOURCES) -DIST_COMMON = ChangeLog Makefile.am Makefile.in dup2.c fncase.c \ - fnmatch.c getdate.c hostname.c memmove.c mkdir.c rename.c \ - strerror.c strstr.c strtoul.c valloc.c waitpid.c +DIST_COMMON = ChangeLog Makefile.am Makefile.in ansi2knr.1 ansi2knr.c \ + dup2.c fncase.c fnmatch.c getdate.c hostname.c memmove.c \ + mkdir.c rename.c strerror.c strstr.c strtoul.c valloc.c \ + waitpid.c SOURCES = $(libcvs_a_SOURCES) all: all-am |
From: Alexey M. <ty...@us...> - 2001-08-26 19:21:55
|
Update of /cvsroot/cvs-nserver/cvs-nserver/doc In directory usw-pr-cvs1:/tmp/cvs-serv16275/doc Modified Files: Tag: NCLI-1-11-1 Makefile.in Log Message: Added ansi2knr to options; bumped up required Automake version number Index: Makefile.in =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/doc/Makefile.in,v retrieving revision 1.1.1.3.2.7.2.1 retrieving revision 1.1.1.3.2.7.2.2 diff -u -d -r1.1.1.3.2.7.2.1 -r1.1.1.3.2.7.2.2 --- Makefile.in 2001/08/19 19:28:34 1.1.1.3.2.7.2.1 +++ Makefile.in 2001/08/26 19:21:53 1.1.1.3.2.7.2.2 @@ -83,6 +83,7 @@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ +CPP = @CPP@ CSH = @CSH@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ @@ -95,6 +96,7 @@ RANLIB = @RANLIB@ ROFF = @ROFF@ TEXI2DVI = @TEXI2DVI@ +U = @U@ VERSION = @VERSION@ YACC = @YACC@ _am_include = @_am_include@ |
From: Alexey M. <ty...@us...> - 2001-08-26 19:21:55
|
Update of /cvsroot/cvs-nserver/cvs-nserver/diff In directory usw-pr-cvs1:/tmp/cvs-serv16275/diff Modified Files: Tag: NCLI-1-11-1 Makefile.in Log Message: Added ansi2knr to options; bumped up required Automake version number Index: Makefile.in =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/diff/Makefile.in,v retrieving revision 1.1.1.4.2.3.2.1 retrieving revision 1.1.1.4.2.3.2.2 diff -u -d -r1.1.1.4.2.3.2.1 -r1.1.1.4.2.3.2.2 --- Makefile.in 2001/08/19 19:28:34 1.1.1.4.2.3.2.1 +++ Makefile.in 2001/08/26 19:21:53 1.1.1.4.2.3.2.2 @@ -58,6 +58,7 @@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ +CPP = @CPP@ CSH = @CSH@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ @@ -70,6 +71,7 @@ RANLIB = @RANLIB@ ROFF = @ROFF@ TEXI2DVI = @TEXI2DVI@ +U = @U@ VERSION = @VERSION@ YACC = @YACC@ _am_include = @_am_include@ |
From: Alexey M. <ty...@us...> - 2001-08-26 19:21:55
|
Update of /cvsroot/cvs-nserver/cvs-nserver/contrib In directory usw-pr-cvs1:/tmp/cvs-serv16275/contrib Modified Files: Tag: NCLI-1-11-1 Makefile.in Log Message: Added ansi2knr to options; bumped up required Automake version number Index: Makefile.in =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/contrib/Makefile.in,v retrieving revision 1.1.1.4.2.4.2.1 retrieving revision 1.1.1.4.2.4.2.2 diff -u -d -r1.1.1.4.2.4.2.1 -r1.1.1.4.2.4.2.2 --- Makefile.in 2001/08/19 19:28:34 1.1.1.4.2.4.2.1 +++ Makefile.in 2001/08/26 19:21:53 1.1.1.4.2.4.2.2 @@ -84,6 +84,7 @@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ +CPP = @CPP@ CSH = @CSH@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ @@ -96,6 +97,7 @@ RANLIB = @RANLIB@ ROFF = @ROFF@ TEXI2DVI = @TEXI2DVI@ +U = @U@ VERSION = @VERSION@ YACC = @YACC@ _am_include = @_am_include@ |
From: Alexey M. <ty...@us...> - 2001-08-26 19:18:20
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src In directory usw-pr-cvs1:/tmp/cvs-serv15860 Modified Files: Tag: NCLI-1-11-1 .cvsignore Log Message: Ignore `ID' file Index: .cvsignore =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/.cvsignore,v retrieving revision 1.1.1.2.2.1 retrieving revision 1.1.1.2.2.1.2.1 diff -u -d -r1.1.1.2.2.1 -r1.1.1.2.2.1.2.1 --- .cvsignore 2001/05/26 12:43:51 1.1.1.2.2.1 +++ .cvsignore 2001/08/26 19:18:16 1.1.1.2.2.1.2.1 @@ -2,6 +2,7 @@ .pure Makefile TAGS +ID check.log check.plog cvspasswd |
From: Alexey M. <ty...@us...> - 2001-08-26 19:17:35
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src In directory usw-pr-cvs1:/tmp/cvs-serv15568 Modified Files: Tag: NCLI-1-11-1 login.c Log Message: Use functions from cvsroot.c instead of ugly comparisons Index: login.c =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/login.c,v retrieving revision 1.1.1.4.2.2.2.3 retrieving revision 1.1.1.4.2.2.2.4 diff -u -d -r1.1.1.4.2.2.2.3 -r1.1.1.4.2.2.2.4 --- login.c 2001/08/26 18:19:02 1.1.1.4.2.2.2.3 +++ login.c 2001/08/26 19:17:32 1.1.1.4.2.2.2.4 @@ -8,6 +8,8 @@ * */ +#include "config.h" + #include "cvs.h" #include "login.h" #include "getline.h" @@ -311,10 +313,9 @@ char *p; int save_errno = 0; - if ( (root->method != pserver_method) && (root->method != sslpserver_method) && - (root->method != nserver_method) ) + if (!method_needs_password(root->method)) { - error (0, 0, "internal error: can only call password_entry_operation with pserver, sslpserver or nserver method"); + error (0, 0, "internal error: cannot call password_entry_operation with this access method;"); error (1, 0, "CVSROOT: %s", root->original); } @@ -537,11 +538,9 @@ if (argc < 0) usage (login_usage); - if ((current_parsed_root->method != pserver_method) && - (current_parsed_root->method != sslpserver_method)) - + if (!method_needs_password(current_parsed_root->method)) { - error (0, 0, "can only use `login' command with the 'pserver' or 'sslpserver' methods"); + error (0, 0, "cannot use `login' command with this access method;"); error (1, 0, "CVSROOT: %s", current_parsed_root->original); } @@ -610,10 +609,9 @@ error (0, 0, "CVS_PASSWORD is no longer supported; ignored"); } - if ((current_parsed_root->method != pserver_method) && - (current_parsed_root->method != sslpserver_method)) + if (!method_needs_password(current_parsed_root->method)) { - error (0, 0, "can only call get_cvs_password with pserver or sslpserver method"); + error (0, 0, "cannot call get_cvs_password with this access method;"); error (1, 0, "CVSROOT: %s", current_parsed_root->original); } @@ -638,7 +636,7 @@ if (argc < 0) usage (logout_usage); - if (current_parsed_root->method != pserver_method) + if (!method_needs_password(current_parsed_root->method)) { error (0, 0, "can only use pserver method with `logout' command"); error (1, 0, "CVSROOT: %s", current_parsed_root->original); |
From: Alexey M. <ty...@us...> - 2001-08-26 19:16:09
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src In directory usw-pr-cvs1:/tmp/cvs-serv15243 Modified Files: Tag: NCLI-1-11-1 cvsroot.h Added Files: Tag: NCLI-1-11-1 cvsroot.c Log Message: Functions for various information about various aspects of cvsroot_t --- NEW FILE: cvsroot.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...> 2001 Various aspects of parsed CVSROOT */ #include "config.h" #include "cvsroot.h" /* * * Returns true if specified method requires password (needs to ask * user or consult ~/.cvspass * */ int method_needs_password (int method) { switch (method) { case pserver_method: case sslpserver_method: case nserver_method: case sslnserver_method: return 1; default: return 0; } } Index: cvsroot.h =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/cvsroot.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.1.2.1 diff -u -d -r1.1.2.1 -r1.1.2.1.2.1 --- cvsroot.h 2001/05/26 14:03:39 1.1.2.1 +++ cvsroot.h 2001/08/26 19:16:06 1.1.2.1.2.1 @@ -40,4 +40,7 @@ extern cvsroot_t *current_parsed_root; + +int method_needs_password (int method); + #endif /* CVSROOT_H */ |
From: Alexey M. <ty...@us...> - 2001-08-26 19:15:12
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src In directory usw-pr-cvs1:/tmp/cvs-serv15152 Modified Files: Tag: NCLI-1-11-1 cvspasswd.c Log Message: Remove unneeded function Index: cvspasswd.c =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/cvspasswd.c,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 --- cvspasswd.c 2001/05/26 14:26:23 1.1.6.1 +++ cvspasswd.c 2001/08/26 19:15:09 1.1.6.1.2.1 @@ -53,30 +53,6 @@ exit(EXIT_FAILURE); \ } -static char * -getpassword PROTO((char *prompt, char *username)); - -static char * -getpassword(prompt, username) - char *prompt; - char *username; -{ - char *password; - int len = strlen(prompt) + strlen(username) + 1; - char *user_prompt = malloc(len); - - if (!user_prompt) - OUT_OF_MEMORY; - - snprintf(user_prompt, len, prompt, username); - - password = strdup(getpass(user_prompt)); - if (!password) - OUT_OF_MEMORY; - free(user_prompt); - return password; -} - #define ALLOWED "/CVSROOT/allow-cvspasswd" static int |
From: Alexey M. <ty...@us...> - 2001-08-26 19:13:39
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src In directory usw-pr-cvs1:/tmp/cvs-serv14913 Modified Files: Tag: NCLI-1-11-1 logging-client.c Log Message: Fix signedness warning Index: logging-client.c =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/logging-client.c,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -u -d -r1.1.4.2 -r1.1.4.3 --- logging-client.c 2001/08/16 22:26:20 1.1.4.2 +++ logging-client.c 2001/08/26 19:13:36 1.1.4.3 @@ -213,7 +213,7 @@ logging_read (NCLI ncli, char *buf, int len) { LCD lcd = ncli->client_data; - int read = ncli->next->read(ncli->next, buf, len); + unsigned int read = ncli->next->read(ncli->next, buf, len); if (fwrite(buf, 1, read, lcd->log_in) < read) return ncli->error(ncli, "Cannot write to %s.in: %s", |
From: Alexey M. <ty...@us...> - 2001-08-26 19:12:13
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src In directory usw-pr-cvs1:/tmp/cvs-serv14658 Modified Files: Tag: NCLI-1-11-1 root.c Log Message: Remove unneeded functions Index: root.c =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/root.c,v retrieving revision 1.1.1.5.2.4.2.1 retrieving revision 1.1.1.5.2.4.2.2 diff -u -d -r1.1.1.5.2.4.2.1 -r1.1.1.5.2.4.2.2 --- root.c 2001/08/19 19:24:19 1.1.1.5.2.4.2.1 +++ root.c 2001/08/26 19:12:11 1.1.1.5.2.4.2.2 @@ -173,103 +173,6 @@ #endif /* ! DEBUG */ -/* The root_allow_* stuff maintains a list of legal CVSROOT - directories. Then we can check against them when a remote user - hands us a CVSROOT directory. */ - -static int root_allow_count; -static char **root_allow_vector; -static int root_allow_size; - -void -root_allow_add (arg) - char *arg; -{ - char *p; - - if (root_allow_size <= root_allow_count) - { - if (root_allow_size == 0) - { - root_allow_size = 1; - root_allow_vector = - (char **) malloc (root_allow_size * sizeof (char *)); - } - else - { - root_allow_size *= 2; - root_allow_vector = - (char **) realloc (root_allow_vector, - root_allow_size * sizeof (char *)); - } - - if (root_allow_vector == NULL) - { - no_memory: - /* Strictly speaking, we're not supposed to output anything - now. But we're about to exit(), give it a try. */ - printf ("E Fatal server error, aborting.\n\ -error ENOMEM Virtual memory exhausted.\n"); - - /* I'm doing this manually rather than via error_exit () - because I'm not sure whether we want to call server_cleanup. - Needs more investigation.... */ - -#ifdef SYSTEM_CLEANUP - /* Hook for OS-specific behavior, for example socket - subsystems on NT and OS2 or dealing with windows - and arguments on Mac. */ - SYSTEM_CLEANUP (); -#endif - - exit (EXIT_FAILURE); - } - } - p = malloc (strlen (arg) + 1); - if (p == NULL) - goto no_memory; - strcpy (p, arg); - root_allow_vector[root_allow_count++] = p; -} - -void -root_allow_free () -{ - if (root_allow_vector != NULL) - free_names (&root_allow_count, root_allow_vector); - root_allow_size = 0; -} - -int -root_allow_ok (arg) - char *arg; -{ - int i; - - if (root_allow_count == 0) - { - /* Probably someone upgraded from CVS before 1.9.10 to 1.9.10 - or later without reading the documentation about - --allow-root. Printing an error here doesn't disclose any - particularly useful information to an attacker because a - CVS server configured in this way won't let *anyone* in. */ - - /* Note that we are called from a context where we can spit - back "error" rather than waiting for the next request which - expects responses. */ - printf ("\ -error 0 Server configuration missing --allow-root in inetd.conf\n"); - error_exit (); - } - - for (i = 0; i < root_allow_count; ++i) - if (strcmp (root_allow_vector[i], arg) == 0) - return 1; - return 0; -} - - - /* This global variable holds the global -d option. It is NULL if -d was not used, which means that we must get the CVSroot information from the CVSROOT environment variable or from a CVS/Root file. */ |
From: Alexey M. <ty...@us...> - 2001-08-26 19:11:35
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src In directory usw-pr-cvs1:/tmp/cvs-serv14529 Modified Files: Tag: NCLI-1-11-1 rsh-client.c Log Message: Add header for unistd.h, if available Index: rsh-client.c =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/rsh-client.c,v retrieving revision 1.1.4.4 retrieving revision 1.1.4.5 diff -u -d -r1.1.4.4 -r1.1.4.5 --- rsh-client.c 2001/08/18 11:06:35 1.1.4.4 +++ rsh-client.c 2001/08/26 19:11:33 1.1.4.5 @@ -16,6 +16,12 @@ */ +#include "config.h" + +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + #include <stdlib.h> #include <sys/types.h> #include <sys/wait.h> |
From: Alexey M. <ty...@us...> - 2001-08-26 19:10:59
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src In directory usw-pr-cvs1:/tmp/cvs-serv14370 Modified Files: Tag: NCLI-1-11-1 ssl-client.c Log Message: SSL error-related functions need their header Index: ssl-client.c =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/ssl-client.c,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- ssl-client.c 2001/08/26 18:20:58 1.1.2.2 +++ ssl-client.c 2001/08/26 19:10:56 1.1.2.3 @@ -21,6 +21,7 @@ #include "config.h" #ifdef HAVE_OPENSSL +#include <openssl/err.h> #include <openssl/ssl.h> #endif |
From: Alexey M. <ty...@us...> - 2001-08-26 18:45:50
|
Update of /cvsroot/cvs-nserver/cvs-nserver/lib In directory usw-pr-cvs1:/tmp/cvs-serv9716 Added Files: Tag: NCLI-1-11-1 ansi2knr.1 ansi2knr.c Log Message: Support automatic de-ANSI-fication --- NEW FILE: ansi2knr.1 --- .TH ANSI2KNR 1 "19 Jan 1996" .SH NAME ansi2knr \- convert ANSI C to Kernighan & Ritchie C .SH SYNOPSIS .I ansi2knr [--varargs] input_file [output_file] .SH DESCRIPTION If no output_file is supplied, output goes to stdout. .br There are no error messages. .sp .I ansi2knr recognizes function definitions by seeing a non-keyword identifier at the left margin, followed by a left parenthesis, with a right parenthesis as the last character on the line, and with a left brace as the first token on the following line (ignoring possible intervening comments). It will recognize a multi-line header provided that no intervening line ends with a left or right brace or a semicolon. These algorithms ignore whitespace and comments, except that the function name must be the first thing on the line. .sp The following constructs will confuse it: .br - Any other construct that starts at the left margin and follows the above syntax (such as a macro or function call). .br - Some macros that tinker with the syntax of the function header. .sp The --varargs switch is obsolete, and is recognized only for backwards compatibility. The present version of .I ansi2knr will always attempt to convert a ... argument to va_alist and va_dcl. .SH AUTHOR L. Peter Deutsch <gh...@al...> wrote the original ansi2knr and continues to maintain the current version; most of the code in the current version is his work. ansi2knr also includes contributions by Francois Pinard <pi...@ir...> and Jim Avera <ji...@ne...>. --- NEW FILE: ansi2knr.c --- /* Copyright (C) 1989, 2000 Aladdin Enterprises. All rights reserved. */ /*$Id: ansi2knr.c,v 1.1.2.1 2001/08/26 18:45:48 tyranny Exp $*/ /* Convert ANSI C function definitions to K&R ("traditional C") syntax */ /* ansi2knr is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. No author or distributor accepts responsibility to anyone for the consequences of using it or for whether it serves any particular purpose or works at all, unless he says so in writing. Refer to the GNU General Public License (the "GPL") for full details. Everyone is granted permission to copy, modify and redistribute ansi2knr, but only under the conditions described in the GPL. A copy of this license is supposed to have been given to you along with ansi2knr so you can know your rights and responsibilities. It should be in a file named COPYLEFT, or, if there is no file named COPYLEFT, a file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. We explicitly state here what we believe is already implied by the GPL: if the ansi2knr program is distributed as a separate set of sources and a separate executable file which are aggregated on a storage medium together with another program, this in itself does not bring the other program under the GPL, nor does the mere fact that such a program or the procedures for constructing it invoke the ansi2knr executable bring any other part of the program under the GPL. */ /* * Usage: ansi2knr [--filename FILENAME] [INPUT_FILE [OUTPUT_FILE]] * --filename provides the file name for the #line directive in the output, * overriding input_file (if present). * If no input_file is supplied, input is read from stdin. * If no output_file is supplied, output goes to stdout. * There are no error messages. * * ansi2knr recognizes function definitions by seeing a non-keyword * identifier at the left margin, followed by a left parenthesis, with a * right parenthesis as the last character on the line, and with a left * brace as the first token on the following line (ignoring possible * intervening comments and/or preprocessor directives), except that a line * consisting of only * identifier1(identifier2) * will not be considered a function definition unless identifier2 is * the word "void", and a line consisting of * identifier1(identifier2, <<arbitrary>>) * will not be considered a function definition. * ansi2knr will recognize a multi-line header provided that no intervening * line ends with a left or right brace or a semicolon. These algorithms * ignore whitespace, comments, and preprocessor directives, except that * the function name must be the first thing on the line. The following * constructs will confuse it: * - Any other construct that starts at the left margin and * follows the above syntax (such as a macro or function call). * - Some macros that tinker with the syntax of function headers. */ /* * The original and principal author of ansi2knr is L. Peter Deutsch * <gh...@al...>. Other authors are noted in the change history * that follows (in reverse chronological order): lpd 2000-04-12 backs out Eggert's changes because of bugs: - concatlits didn't declare the type of its bufend argument; - concatlits didn't't recognize when it was inside a comment; - scanstring could scan backward past the beginning of the string; when - the check for \ + newline in scanstring was unnecessary. 2000-03-05 Paul Eggert <eg...@tw...> Add support for concatenated string literals. * ansi2knr.c (concatlits): New decl. (main): Invoke concatlits to concatenate string literals. (scanstring): Handle backslash-newline correctly. Work with character constants. Fix bug when scanning backwards through backslash-quote. Check for unterminated strings. (convert1): Parse character constants, too. (appendline, concatlits): New functions. * ansi2knr.1: Document this. lpd 1999-08-17 added code to allow preprocessor directives wherever comments are allowed lpd 1999-04-12 added minor fixes from Pavel Roskin <pav...@ge...> for clean compilation with gcc -W -Wall lpd 1999-03-22 added hack to recognize lines consisting of identifier1(identifier2, xxx) as *not* being procedures lpd 1999-02-03 made indentation of preprocessor commands consistent lpd 1999-01-28 fixed two bugs: a '/' in an argument list caused an endless loop; quoted strings within an argument list confused the parser lpd 1999-01-24 added a check for write errors on the output, suggested by Jim Meyering <mey...@as...> lpd 1998-11-09 added further hack to recognize identifier(void) as being a procedure lpd 1998-10-23 added hack to recognize lines consisting of identifier1(identifier2) as *not* being procedures lpd 1997-12-08 made input_file optional; only closes input and/or output file if not stdin or stdout respectively; prints usage message on stderr rather than stdout; adds --filename switch (changes suggested by <ce...@ly...>) lpd 1996-01-21 added code to cope with not HAVE_CONFIG_H and with compilers that don't understand void, as suggested by Tom Lane lpd 1996-01-15 changed to require that the first non-comment token on the line following a function header be a left brace, to reduce sensitivity to macros, as suggested by Tom Lane <tg...@ss...> lpd 1995-06-22 removed #ifndefs whose sole purpose was to define undefined preprocessor symbols as 0; changed all #ifdefs for configuration symbols to #ifs lpd 1995-04-05 changed copyright notice to make it clear that including ansi2knr in a program does not bring the entire program under the GPL lpd 1994-12-18 added conditionals for systems where ctype macros don't handle 8-bit characters properly, suggested by Francois Pinard <pi...@ir...>; removed --varargs switch (this is now the default) lpd 1994-10-10 removed CONFIG_BROKETS conditional lpd 1994-07-16 added some conditionals to help GNU `configure', suggested by Francois Pinard <pi...@ir...>; properly erase prototype args in function parameters, contributed by Jim Avera <ji...@ne...>; correct error in writeblanks (it shouldn't erase EOLs) lpd 1989-xx-xx original version */ /* Most of the conditionals here are to make ansi2knr work with */ /* or without the GNU configure machinery. */ #if HAVE_CONFIG_H # include <config.h> #endif #include <stdio.h> #include <ctype.h> #if HAVE_CONFIG_H /* For properly autoconfiguring ansi2knr, use AC_CONFIG_HEADER(config.h). This will define HAVE_CONFIG_H and so, activate the following lines. */ # if STDC_HEADERS || HAVE_STRING_H # include <string.h> # else # include <strings.h> # endif #else /* not HAVE_CONFIG_H */ /* Otherwise do it the hard way */ # ifdef BSD # include <strings.h> # else # ifdef VMS extern int strlen(), strncmp(); # else # include <string.h> # endif # endif #endif /* not HAVE_CONFIG_H */ #if STDC_HEADERS # include <stdlib.h> #else /* malloc and free should be declared in stdlib.h, but if you've got a K&R compiler, they probably aren't. */ # ifdef MSDOS # include <malloc.h> # else # ifdef VMS extern char *malloc(); extern void free(); # else extern char *malloc(); extern int free(); # endif # endif #endif /* Define NULL (for *very* old compilers). */ #ifndef NULL # define NULL (0) #endif /* * The ctype macros don't always handle 8-bit characters correctly. * Compensate for this here. */ #ifdef isascii # undef HAVE_ISASCII /* just in case */ # define HAVE_ISASCII 1 #else #endif #if STDC_HEADERS || !HAVE_ISASCII # define is_ascii(c) 1 #else # define is_ascii(c) isascii(c) #endif #define is_space(c) (is_ascii(c) && isspace(c)) #define is_alpha(c) (is_ascii(c) && isalpha(c)) #define is_alnum(c) (is_ascii(c) && isalnum(c)) /* Scanning macros */ #define isidchar(ch) (is_alnum(ch) || (ch) == '_') #define isidfirstchar(ch) (is_alpha(ch) || (ch) == '_') /* Forward references */ char *ppdirforward(); char *ppdirbackward(); char *skipspace(); char *scanstring(); int writeblanks(); int test1(); int convert1(); /* The main program */ int main(argc, argv) int argc; char *argv[]; { FILE *in = stdin; FILE *out = stdout; char *filename = 0; char *program_name = argv[0]; char *output_name = 0; #define bufsize 5000 /* arbitrary size */ char *buf; char *line; char *more; char *usage = "Usage: ansi2knr [--filename FILENAME] [INPUT_FILE [OUTPUT_FILE]]\n"; /* * In previous versions, ansi2knr recognized a --varargs switch. * If this switch was supplied, ansi2knr would attempt to convert * a ... argument to va_alist and va_dcl; if this switch was not * supplied, ansi2knr would simply drop any such arguments. * Now, ansi2knr always does this conversion, and we only * check for this switch for backward compatibility. */ int convert_varargs = 1; int output_error; while ( argc > 1 && argv[1][0] == '-' ) { if ( !strcmp(argv[1], "--varargs") ) { convert_varargs = 1; argc--; argv++; continue; } if ( !strcmp(argv[1], "--filename") && argc > 2 ) { filename = argv[2]; argc -= 2; argv += 2; continue; } fprintf(stderr, "%s: Unrecognized switch: %s\n", program_name, argv[1]); fprintf(stderr, usage); exit(1); } switch ( argc ) { default: fprintf(stderr, usage); exit(0); case 3: output_name = argv[2]; out = fopen(output_name, "w"); if ( out == NULL ) { fprintf(stderr, "%s: Cannot open output file %s\n", program_name, output_name); exit(1); } /* falls through */ case 2: in = fopen(argv[1], "r"); if ( in == NULL ) { fprintf(stderr, "%s: Cannot open input file %s\n", program_name, argv[1]); exit(1); } if ( filename == 0 ) filename = argv[1]; /* falls through */ case 1: break; } if ( filename ) fprintf(out, "#line 1 \"%s\"\n", filename); buf = malloc(bufsize); if ( buf == NULL ) { fprintf(stderr, "Unable to allocate read buffer!\n"); exit(1); } line = buf; while ( fgets(line, (unsigned)(buf + bufsize - line), in) != NULL ) { test: line += strlen(line); switch ( test1(buf) ) { case 2: /* a function header */ convert1(buf, out, 1, convert_varargs); break; case 1: /* a function */ /* Check for a { at the start of the next line. */ more = ++line; f: if ( line >= buf + (bufsize - 1) ) /* overflow check */ goto wl; if ( fgets(line, (unsigned)(buf + bufsize - line), in) == NULL ) goto wl; switch ( *skipspace(ppdirforward(more), 1) ) { case '{': /* Definitely a function header. */ convert1(buf, out, 0, convert_varargs); fputs(more, out); break; case 0: /* The next line was blank or a comment: */ /* keep scanning for a non-comment. */ line += strlen(line); goto f; default: /* buf isn't a function header, but */ /* more might be. */ fputs(buf, out); strcpy(buf, more); line = buf; goto test; } break; case -1: /* maybe the start of a function */ if ( line != buf + (bufsize - 1) ) /* overflow check */ continue; /* falls through */ default: /* not a function */ wl: fputs(buf, out); break; } line = buf; } if ( line != buf ) fputs(buf, out); free(buf); if ( output_name ) { output_error = ferror(out); output_error |= fclose(out); } else { /* out == stdout */ fflush(out); output_error = ferror(out); } if ( output_error ) { fprintf(stderr, "%s: error writing to %s\n", program_name, (output_name ? output_name : "stdout")); exit(1); } if ( in != stdin ) fclose(in); return 0; } /* * Skip forward or backward over one or more preprocessor directives. */ char * ppdirforward(p) char *p; { for (; *p == '#'; ++p) { for (; *p != '\r' && *p != '\n'; ++p) if (*p == 0) return p; if (*p == '\r' && p[1] == '\n') ++p; } return p; } char * ppdirbackward(p, limit) char *p; char *limit; { char *np = p; for (;; p = --np) { if (*np == '\n' && np[-1] == '\r') --np; for (; np > limit && np[-1] != '\r' && np[-1] != '\n'; --np) if (np[-1] == 0) return np; if (*np != '#') return p; } } /* * Skip over whitespace, comments, and preprocessor directives, * in either direction. */ char * skipspace(p, dir) char *p; int dir; /* 1 for forward, -1 for backward */ { for ( ; ; ) { while ( is_space(*p) ) p += dir; if ( !(*p == '/' && p[dir] == '*') ) break; p += dir; p += dir; while ( !(*p == '*' && p[dir] == '/') ) { if ( *p == 0 ) return p; /* multi-line comment?? */ p += dir; } p += dir; p += dir; } return p; } /* Scan over a quoted string, in either direction. */ char * scanstring(p, dir) char *p; int dir; { for (p += dir; ; p += dir) if (*p == '"' && p[-dir] != '\\') return p + dir; } /* * Write blanks over part of a string. * Don't overwrite end-of-line characters. */ int writeblanks(start, end) char *start; char *end; { char *p; for ( p = start; p < end; p++ ) if ( *p != '\r' && *p != '\n' ) *p = ' '; return 0; } /* * Test whether the string in buf is a function definition. * The string may contain and/or end with a newline. * Return as follows: * 0 - definitely not a function definition; * 1 - definitely a function definition; * 2 - definitely a function prototype (NOT USED); * -1 - may be the beginning of a function definition, * append another line and look again. * The reason we don't attempt to convert function prototypes is that * Ghostscript's declaration-generating macros look too much like * prototypes, and confuse the algorithms. */ int test1(buf) char *buf; { char *p = buf; char *bend; char *endfn; int contin; if ( !isidfirstchar(*p) ) return 0; /* no name at left margin */ bend = skipspace(ppdirbackward(buf + strlen(buf) - 1, buf), -1); switch ( *bend ) { case ';': contin = 0 /*2*/; break; case ')': contin = 1; break; case '{': return 0; /* not a function */ case '}': return 0; /* not a function */ default: contin = -1; } while ( isidchar(*p) ) p++; endfn = p; p = skipspace(p, 1); if ( *p++ != '(' ) return 0; /* not a function */ p = skipspace(p, 1); if ( *p == ')' ) return 0; /* no parameters */ /* Check that the apparent function name isn't a keyword. */ /* We only need to check for keywords that could be followed */ /* by a left parenthesis (which, unfortunately, is most of them). */ { static char *words[] = { "asm", "auto", "case", "char", "const", "double", "extern", "float", "for", "if", "int", "long", "register", "return", "short", "signed", "sizeof", "static", "switch", "typedef", "unsigned", "void", "volatile", "while", 0 }; char **key = words; char *kp; unsigned len = endfn - buf; while ( (kp = *key) != 0 ) { if ( strlen(kp) == len && !strncmp(kp, buf, len) ) return 0; /* name is a keyword */ key++; } } { char *id = p; int len; /* * Check for identifier1(identifier2) and not * identifier1(void), or identifier1(identifier2, xxxx). */ while ( isidchar(*p) ) p++; len = p - id; p = skipspace(p, 1); if (*p == ',' || (*p == ')' && (len != 4 || strncmp(id, "void", 4))) ) return 0; /* not a function */ } /* * If the last significant character was a ), we need to count * parentheses, because it might be part of a formal parameter * that is a procedure. */ if (contin > 0) { int level = 0; for (p = skipspace(buf, 1); *p; p = skipspace(p + 1, 1)) level += (*p == '(' ? 1 : *p == ')' ? -1 : 0); if (level > 0) contin = -1; } return contin; } /* Convert a recognized function definition or header to K&R syntax. */ int convert1(buf, out, header, convert_varargs) char *buf; FILE *out; int header; /* Boolean */ int convert_varargs; /* Boolean */ { char *endfn; char *p; /* * The breaks table contains pointers to the beginning and end * of each argument. */ char **breaks; unsigned num_breaks = 2; /* for testing */ char **btop; char **bp; char **ap; char *vararg = 0; /* Pre-ANSI implementations don't agree on whether strchr */ /* is called strchr or index, so we open-code it here. */ for ( endfn = buf; *(endfn++) != '('; ) ; top: p = endfn; breaks = (char **)malloc(sizeof(char *) * num_breaks * 2); if ( breaks == NULL ) { /* Couldn't allocate break table, give up */ fprintf(stderr, "Unable to allocate break table!\n"); fputs(buf, out); return -1; } btop = breaks + num_breaks * 2 - 2; bp = breaks; /* Parse the argument list */ do { int level = 0; char *lp = NULL; char *rp = NULL; char *end = NULL; if ( bp >= btop ) { /* Filled up break table. */ /* Allocate a bigger one and start over. */ free((char *)breaks); num_breaks <<= 1; goto top; } *bp++ = p; /* Find the end of the argument */ for ( ; end == NULL; p++ ) { switch(*p) { case ',': if ( !level ) end = p; break; case '(': if ( !level ) lp = p; level++; break; case ')': if ( --level < 0 ) end = p; else rp = p; break; case '/': if (p[1] == '*') p = skipspace(p, 1) - 1; break; case '"': p = scanstring(p, 1) - 1; break; default: ; } } /* Erase any embedded prototype parameters. */ if ( lp && rp ) writeblanks(lp + 1, rp); p--; /* back up over terminator */ /* Find the name being declared. */ /* This is complicated because of procedure and */ /* array modifiers. */ for ( ; ; ) { p = skipspace(p - 1, -1); switch ( *p ) { case ']': /* skip array dimension(s) */ case ')': /* skip procedure args OR name */ { int level = 1; while ( level ) switch ( *--p ) { case ']': case ')': level++; break; case '[': case '(': level--; break; case '/': if (p > buf && p[-1] == '*') p = skipspace(p, -1) + 1; break; case '"': p = scanstring(p, -1) + 1; break; default: ; } } if ( *p == '(' && *skipspace(p + 1, 1) == '*' ) { /* We found the name being declared */ while ( !isidfirstchar(*p) ) p = skipspace(p, 1) + 1; goto found; } break; default: goto found; } } found: if ( *p == '.' && p[-1] == '.' && p[-2] == '.' ) { if ( convert_varargs ) { *bp++ = "va_alist"; vararg = p-2; } else { p++; if ( bp == breaks + 1 ) /* sole argument */ writeblanks(breaks[0], p); else writeblanks(bp[-1] - 1, p); bp--; } } else { while ( isidchar(*p) ) p--; *bp++ = p+1; } p = end; } while ( *p++ == ',' ); *bp = p; /* Make a special check for 'void' arglist */ if ( bp == breaks+2 ) { p = skipspace(breaks[0], 1); if ( !strncmp(p, "void", 4) ) { p = skipspace(p+4, 1); if ( p == breaks[2] - 1 ) { bp = breaks; /* yup, pretend arglist is empty */ writeblanks(breaks[0], p + 1); } } } /* Put out the function name and left parenthesis. */ p = buf; while ( p != endfn ) putc(*p, out), p++; /* Put out the declaration. */ if ( header ) { fputs(");", out); for ( p = breaks[0]; *p; p++ ) if ( *p == '\r' || *p == '\n' ) putc(*p, out); } else { for ( ap = breaks+1; ap < bp; ap += 2 ) { p = *ap; while ( isidchar(*p) ) putc(*p, out), p++; if ( ap < bp - 1 ) fputs(", ", out); } fputs(") ", out); /* Put out the argument declarations */ for ( ap = breaks+2; ap <= bp; ap += 2 ) (*ap)[-1] = ';'; if ( vararg != 0 ) { *vararg = 0; fputs(breaks[0], out); /* any prior args */ fputs("va_dcl", out); /* the final arg */ fputs(bp[0], out); } else fputs(breaks[0], out); } free((char *)breaks); return 0; } |
From: Alexey M. <ty...@us...> - 2001-08-26 18:21:00
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src In directory usw-pr-cvs1:/tmp/cvs-serv4155 Modified Files: Tag: NCLI-1-11-1 ssl-client.c Log Message: Fixed stupid bug with SSL_read(); fixes, more debugging output Index: ssl-client.c =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/ssl-client.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 --- ssl-client.c 2001/08/19 19:21:25 1.1.2.1 +++ ssl-client.c 2001/08/26 18:20:58 1.1.2.2 @@ -85,11 +85,10 @@ int sockfd = ncli_connect_socket(ncli, sslcd->hostname, sslcd->port); SSL_CTX *ctx; SSL *ssl; - BIO *sbio; - puts("Entered ssl_connect()"); + ctx = SSL_CTX_new(SSLv3_client_method()); - ctx = SSL_CTX_new(SSLv3_method()); + SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, NULL); ssl = SSL_new(ctx); if (ssl == NULL) { @@ -98,8 +97,7 @@ ERR_reason_error_string(ssl_err)); } - sbio = BIO_new_socket(sockfd, BIO_NOCLOSE); - SSL_set_bio(ssl, sbio, sbio); + SSL_set_fd(ssl, sockfd); if (!SSL_connect(ssl)) { long ssl_err = ERR_get_error(); @@ -108,13 +106,42 @@ ERR_reason_error_string(ssl_err)); } -/* if (SSL_get_verify_result(ssl) != X509_V_OK) { +/* + if (SSL_get_verify_result(ssl) != X509_V_OK) { long ssl_err = ERR_get_error(); return ncli->error(ncli, "Could not verify certificate results: %s", - ERR_reason_error_string(ssl_err)); - } */ + ERR_reason_error_string(ssl_err)); + } + + server_cert = SSL_get_peer_certificate(ssl); + if (server_cert == NULL) { + long ssl_err = ERR_get_error(); + return ncli->error(ncli, "Could not get peer certificate: %s", + ERR_reason_error_string(ssl_err)); + } + + str = X509_NAME_oneline (X509_get_subject_name (server_cert), 0, 0); + if (str == NULL) { + long ssl_err = ERR_get_error(); + return ncli->error(ncli, "Could not get subject name from certificate: %s", + ERR_reason_error_string(ssl_err)); + } + printf ("Certificate subject: %s\n", str); + free (str); + str = X509_NAME_oneline (X509_get_issuer_name (server_cert), 0, 0); + if (str == NULL) { + long ssl_err = ERR_get_error(); + return ncli->error(ncli, "Could not get issuer name from certificate: %s", + ERR_reason_error_string(ssl_err)); + } + printf ("Certificate issuer: %s\n", str); + free (str); + + X509_free(server_cert); +*/ + sslcd->ssl = ssl; return NCLI_SUCCESS; @@ -140,12 +167,10 @@ SSL *ssl = sslcd->ssl; int nread = 0; - printf("ssl_read(%d)\n", len); - while (len > 0) { int n = SSL_read(ssl, buf + nread, len); - long ssl_err = SSL_get_error(ssl, nread); + long ssl_err = SSL_get_error(ssl, n); if (ssl_err == SSL_ERROR_ZERO_RETURN) break; @@ -166,8 +191,6 @@ SSLCD sslcd = (SSLCD) ncli->client_data; SSL *ssl = sslcd->ssl; - printf("ssl_write(%d)\n", len); - while (len > 0) { int n = SSL_write(ssl, buf, len); @@ -188,7 +211,6 @@ int ssl_flush (NCLI ncli) { - SSLCD sslcd = (SSLCD) ncli->client_data; return NCLI_SUCCESS; } |
From: Alexey M. <ty...@us...> - 2001-08-26 18:19:45
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src In directory usw-pr-cvs1:/tmp/cvs-serv3870 Modified Files: Tag: NCLI-1-11-1 socket-client.c Log Message: Removed unused socket_errstr() Index: socket-client.c =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/socket-client.c,v retrieving revision 1.1.4.3 retrieving revision 1.1.4.4 diff -u -d -r1.1.4.3 -r1.1.4.4 --- socket-client.c 2001/08/19 19:19:16 1.1.4.3 +++ socket-client.c 2001/08/26 18:19:42 1.1.4.4 @@ -47,8 +47,6 @@ static int socket_write(NCLI, char *buf, int len); static int socket_flush(NCLI); -static char *socket_errstr(NCLI); - struct network_client * create_socket_client (cvsroot_t *CVSROOT, ncli_error_cb error_cb) { |
From: Alexey M. <ty...@us...> - 2001-08-26 18:19:04
|
Update of /cvsroot/cvs-nserver/cvs-nserver/src In directory usw-pr-cvs1:/tmp/cvs-serv3723 Modified Files: Tag: NCLI-1-11-1 login.c Log Message: Make password-related stuff work with :sslpserver: Index: login.c =================================================================== RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/login.c,v retrieving revision 1.1.1.4.2.2.2.2 retrieving revision 1.1.1.4.2.2.2.3 diff -u -d -r1.1.1.4.2.2.2.2 -r1.1.1.4.2.2.2.3 --- login.c 2001/08/19 19:24:19 1.1.1.4.2.2.2.2 +++ login.c 2001/08/26 18:19:02 1.1.1.4.2.2.2.3 @@ -311,9 +311,10 @@ char *p; int save_errno = 0; - if ( (root->method != pserver_method) && (root->method != nserver_method) ) + if ( (root->method != pserver_method) && (root->method != sslpserver_method) && + (root->method != nserver_method) ) { - error (0, 0, "internal error: can only call password_entry_operation with pserver or nserver method"); + error (0, 0, "internal error: can only call password_entry_operation with pserver, sslpserver or nserver method"); error (1, 0, "CVSROOT: %s", root->original); } @@ -609,9 +610,10 @@ error (0, 0, "CVS_PASSWORD is no longer supported; ignored"); } - if (current_parsed_root->method != pserver_method) + if ((current_parsed_root->method != pserver_method) && + (current_parsed_root->method != sslpserver_method)) { - error (0, 0, "can only call get_cvs_password with pserver method"); + error (0, 0, "can only call get_cvs_password with pserver or sslpserver method"); error (1, 0, "CVSROOT: %s", current_parsed_root->original); } |