[PC-BSD Commits] r19957 - in pcbsd/current/src-sh/pc-adctl: . pc-krbconf pc-ldapconf pc-nssconf pc-nssldapconf pc-pamconf pc-sambaconf

svn at pcbsd.org svn at pcbsd.org
Thu Oct 25 14:43:24 PDT 2012


Author: johnh
Date: 2012-10-25 21:43:24 +0000 (Thu, 25 Oct 2012)
New Revision: 19957

Added:
   pcbsd/current/src-sh/pc-adctl/pc-krbconf/
   pcbsd/current/src-sh/pc-adctl/pc-krbconf/pc-krbconf.c
   pcbsd/current/src-sh/pc-adctl/pc-krbconf/pc-krbconf.h
   pcbsd/current/src-sh/pc-adctl/pc-ldapconf/
   pcbsd/current/src-sh/pc-adctl/pc-ldapconf/pc-ldapconf.c
   pcbsd/current/src-sh/pc-adctl/pc-ldapconf/pc-ldapconf.h
   pcbsd/current/src-sh/pc-adctl/pc-nssconf/
   pcbsd/current/src-sh/pc-adctl/pc-nssconf/pc-nssconf.c
   pcbsd/current/src-sh/pc-adctl/pc-nssconf/pc-nssconf.h
   pcbsd/current/src-sh/pc-adctl/pc-nssldapconf/
   pcbsd/current/src-sh/pc-adctl/pc-nssldapconf/pc-nssldapconf.c
   pcbsd/current/src-sh/pc-adctl/pc-nssldapconf/pc-nssldapconf.h
   pcbsd/current/src-sh/pc-adctl/pc-pamconf/
   pcbsd/current/src-sh/pc-adctl/pc-pamconf/pc-pamconf.c
   pcbsd/current/src-sh/pc-adctl/pc-pamconf/pc-pamconf.h
   pcbsd/current/src-sh/pc-adctl/pc-sambaconf/
   pcbsd/current/src-sh/pc-adctl/pc-sambaconf/pc-sambaconf.c
   pcbsd/current/src-sh/pc-adctl/pc-sambaconf/pc-sambaconf.h
Removed:
   pcbsd/current/src-sh/pc-adctl/krb/
   pcbsd/current/src-sh/pc-adctl/ldap/
   pcbsd/current/src-sh/pc-adctl/nss/
   pcbsd/current/src-sh/pc-adctl/nssldap/
   pcbsd/current/src-sh/pc-adctl/pam/
   pcbsd/current/src-sh/pc-adctl/pc-krbconf/krb5-parser.tab.i
   pcbsd/current/src-sh/pc-adctl/pc-krbconf/krbconf.c
   pcbsd/current/src-sh/pc-adctl/pc-krbconf/krbconf.h
   pcbsd/current/src-sh/pc-adctl/pc-ldapconf/ldapconf.c
   pcbsd/current/src-sh/pc-adctl/pc-ldapconf/ldapconf.h
   pcbsd/current/src-sh/pc-adctl/pc-nssconf/nssconf.c
   pcbsd/current/src-sh/pc-adctl/pc-nssconf/nssconf.h
   pcbsd/current/src-sh/pc-adctl/pc-nssldapconf/nssldapconf.c
   pcbsd/current/src-sh/pc-adctl/pc-nssldapconf/nssldapconf.h
   pcbsd/current/src-sh/pc-adctl/pc-pamconf/pamconf.c
   pcbsd/current/src-sh/pc-adctl/pc-pamconf/pamconf.h
   pcbsd/current/src-sh/pc-adctl/pc-sambaconf/sambaconf.c
   pcbsd/current/src-sh/pc-adctl/pc-sambaconf/sambaconf.h
   pcbsd/current/src-sh/pc-adctl/samba/
Modified:
   pcbsd/current/src-sh/pc-adctl/Makefile
   pcbsd/current/src-sh/pc-adctl/pc-krbconf/Makefile
   pcbsd/current/src-sh/pc-adctl/pc-krbconf/krb5-lexer.l
   pcbsd/current/src-sh/pc-adctl/pc-krbconf/krb5-parser.y
   pcbsd/current/src-sh/pc-adctl/pc-ldapconf/Makefile
   pcbsd/current/src-sh/pc-adctl/pc-ldapconf/ldap-lexer.l
   pcbsd/current/src-sh/pc-adctl/pc-ldapconf/ldap-parser.y
   pcbsd/current/src-sh/pc-adctl/pc-nssconf/Makefile
   pcbsd/current/src-sh/pc-adctl/pc-nssconf/nss-lexer.l
   pcbsd/current/src-sh/pc-adctl/pc-nssconf/nss-parser.y
   pcbsd/current/src-sh/pc-adctl/pc-nssldapconf/Makefile
   pcbsd/current/src-sh/pc-adctl/pc-nssldapconf/nssldap-lexer.l
   pcbsd/current/src-sh/pc-adctl/pc-nssldapconf/nssldap-parser.y
   pcbsd/current/src-sh/pc-adctl/pc-pamconf/Makefile
   pcbsd/current/src-sh/pc-adctl/pc-pamconf/pam-lexer.l
   pcbsd/current/src-sh/pc-adctl/pc-pamconf/pam-parser.y
   pcbsd/current/src-sh/pc-adctl/pc-sambaconf/Makefile
   pcbsd/current/src-sh/pc-adctl/pc-sambaconf/samba-lexer.l
   pcbsd/current/src-sh/pc-adctl/pc-sambaconf/samba-parser.y
Log:
Modified to work with older version of yacc since new version has not been MFC'd yet. While here, modified layout to make more sense.



Modified: pcbsd/current/src-sh/pc-adctl/Makefile
===================================================================
--- pcbsd/current/src-sh/pc-adctl/Makefile	2012-10-25 20:50:24 UTC (rev 19956)
+++ pcbsd/current/src-sh/pc-adctl/Makefile	2012-10-25 21:43:24 UTC (rev 19957)
@@ -1,4 +1,4 @@
-SUBDIR=krb ldap nss nssldap pam samba scripts conf rc
+SUBDIR=pc-krbconf pc-ldapconf pc-nssconf pc-nssldapconf pc-pamconf pc-sambaconf scripts conf rc
 
 .include <bsd.subdir.mk>
 

Modified: pcbsd/current/src-sh/pc-adctl/pc-krbconf/Makefile
===================================================================
--- pcbsd/current/src-sh/pc-adctl/krb/Makefile	2012-10-25 15:42:48 UTC (rev 19923)
+++ pcbsd/current/src-sh/pc-adctl/pc-krbconf/Makefile	2012-10-25 21:43:24 UTC (rev 19957)
@@ -11,7 +11,7 @@
 DESTDIR=	/usr/local/bin
 
 PROG=	pc-krbconf
-SRCS=	krbconf.c krbconf.h
+SRCS=	pc-krbconf.c pc-krbconf.h
 
 CFLAGS+= -I. -I${.CURDIR}
 
@@ -31,13 +31,13 @@
 
 CLEANFILES+= krb5-parser.tab.o krb5-lexer.lex.o \
 	krb5-parser.tab.c krb5-parser.tab.h krb5-lexer.lex.c \
-	krb5-parseer.tab.i
+	krb5-parser.tab.i
 
 krb5-lexer.tab.o: krb5-parser.tab.c krb5-parser.tab.h
 krb5-parser.tab.o: krb5-lexer.lex.c krb5-parser.tab.h
 
 krb5-parser.tab.c: krb5-parser.y
-	${BISON} -o$@ -i -d krb5-parser.y
+	${BISON} -o$@ -d krb5-parser.y
 
 krb5-parser.tab.h: krb5-parser.tab.c
 

Modified: pcbsd/current/src-sh/pc-adctl/pc-krbconf/krb5-lexer.l
===================================================================
--- pcbsd/current/src-sh/pc-adctl/krb/krb5-lexer.l	2012-10-25 15:42:48 UTC (rev 19923)
+++ pcbsd/current/src-sh/pc-adctl/pc-krbconf/krb5-lexer.l	2012-10-25 21:43:24 UTC (rev 19957)
@@ -10,9 +10,11 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "pc-krbconf.h"
 #include "krb5-parser.tab.h"
-#include "krb5-parser.tab.i"
 
+int lineno = 0;
+
 %}
 
 %%
@@ -38,8 +40,6 @@
 
 %%
 
-int lineno = 0;
-
 int
 yywrap(void)
 {

Modified: pcbsd/current/src-sh/pc-adctl/pc-krbconf/krb5-parser.y
===================================================================
--- pcbsd/current/src-sh/pc-adctl/krb/krb5-parser.y	2012-10-25 15:42:48 UTC (rev 19923)
+++ pcbsd/current/src-sh/pc-adctl/pc-krbconf/krb5-parser.y	2012-10-25 21:43:24 UTC (rev 19957)
@@ -4,7 +4,7 @@
  *	krb5.conf parser
  */
 
-#include "krbconf.h"
+#include "pc-krbconf.h"
 
 extern	int yylex(void);
 extern	int yyparse();

Modified: pcbsd/current/src-sh/pc-adctl/pc-ldapconf/Makefile
===================================================================
--- pcbsd/current/src-sh/pc-adctl/ldap/Makefile	2012-10-25 15:42:48 UTC (rev 19923)
+++ pcbsd/current/src-sh/pc-adctl/pc-ldapconf/Makefile	2012-10-25 21:43:24 UTC (rev 19957)
@@ -11,7 +11,7 @@
 DESTDIR=	/usr/local/bin
 
 PROG=	pc-ldapconf
-SRCS=	ldapconf.c ldapconf.h
+SRCS=	pc-ldapconf.c pc-ldapconf.h
 
 CFLAGS+= -I. -I${.CURDIR}
 
@@ -38,7 +38,7 @@
 ldap-parser.tab.o: ldap-lexer.lex.c ldap-parser.tab.h
 
 ldap-parser.tab.c: ldap-parser.y
-	${BISON} -o$@ -i -d ldap-parser.y
+	${BISON} -o$@ -d ldap-parser.y
 
 ldap-parser.tab.h: ldap-parser.tab.c
 

Modified: pcbsd/current/src-sh/pc-adctl/pc-ldapconf/ldap-lexer.l
===================================================================
--- pcbsd/current/src-sh/pc-adctl/ldap/ldap-lexer.l	2012-10-25 15:42:48 UTC (rev 19923)
+++ pcbsd/current/src-sh/pc-adctl/pc-ldapconf/ldap-lexer.l	2012-10-25 21:43:24 UTC (rev 19957)
@@ -10,8 +10,8 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "pc-ldapconf.h"
 #include "ldap-parser.tab.h"
-#include "ldap-parser.tab.i"
 
 %}
 

Modified: pcbsd/current/src-sh/pc-adctl/pc-ldapconf/ldap-parser.y
===================================================================
--- pcbsd/current/src-sh/pc-adctl/ldap/ldap-parser.y	2012-10-25 15:42:48 UTC (rev 19923)
+++ pcbsd/current/src-sh/pc-adctl/pc-ldapconf/ldap-parser.y	2012-10-25 21:43:24 UTC (rev 19957)
@@ -4,7 +4,7 @@
  *	ldap parser
  */
 
-#include "ldapconf.h"
+#include "pc-ldapconf.h"
 
 extern	int yylex(void);
 extern	int yyparse();

Modified: pcbsd/current/src-sh/pc-adctl/pc-nssconf/Makefile
===================================================================
--- pcbsd/current/src-sh/pc-adctl/nss/Makefile	2012-10-25 15:42:48 UTC (rev 19923)
+++ pcbsd/current/src-sh/pc-adctl/pc-nssconf/Makefile	2012-10-25 21:43:24 UTC (rev 19957)
@@ -11,7 +11,7 @@
 DESTDIR=	/usr/local/bin
 
 PROG=	pc-nssconf
-SRCS=	nssconf.c nssconf.h
+SRCS=	pc-nssconf.c pc-nssconf.h
 
 CFLAGS+= -I. -I${.CURDIR}
 
@@ -38,7 +38,7 @@
 nss-parser.tab.o: nss-lexer.lex.c nss-parser.tab.h
 
 nss-parser.tab.c: nss-parser.y
-	${BISON} -o$@ -i -d nss-parser.y
+	${BISON} -o$@ -d nss-parser.y
 
 nss-parser.tab.h: nss-parser.tab.c
 

Modified: pcbsd/current/src-sh/pc-adctl/pc-nssconf/nss-lexer.l
===================================================================
--- pcbsd/current/src-sh/pc-adctl/nss/nss-lexer.l	2012-10-25 15:42:48 UTC (rev 19923)
+++ pcbsd/current/src-sh/pc-adctl/pc-nssconf/nss-lexer.l	2012-10-25 21:43:24 UTC (rev 19957)
@@ -10,8 +10,8 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "pc-nssconf.h"
 #include "nss-parser.tab.h"
-#include "nss-parser.tab.i"
 
 
 %}

Modified: pcbsd/current/src-sh/pc-adctl/pc-nssconf/nss-parser.y
===================================================================
--- pcbsd/current/src-sh/pc-adctl/nss/nss-parser.y	2012-10-25 15:42:48 UTC (rev 19923)
+++ pcbsd/current/src-sh/pc-adctl/pc-nssconf/nss-parser.y	2012-10-25 21:43:24 UTC (rev 19957)
@@ -4,7 +4,7 @@
  *	NSS parser
  */
 
-#include "nssconf.h"
+#include "pc-nssconf.h"
 
 extern	int yylex(void);
 extern	int yyparse();

Modified: pcbsd/current/src-sh/pc-adctl/pc-nssldapconf/Makefile
===================================================================
--- pcbsd/current/src-sh/pc-adctl/nssldap/Makefile	2012-10-25 15:42:48 UTC (rev 19923)
+++ pcbsd/current/src-sh/pc-adctl/pc-nssldapconf/Makefile	2012-10-25 21:43:24 UTC (rev 19957)
@@ -11,7 +11,7 @@
 DESTDIR=	/usr/local/bin
 
 PROG=	pc-nssldapconf
-SRCS=	nssldapconf.c nssldapconf.h
+SRCS=	pc-nssldapconf.c pc-nssldapconf.h
 
 CFLAGS+= -I. -I${.CURDIR}
 
@@ -38,7 +38,7 @@
 nssldap-parser.tab.o: nssldap-lexer.lex.c nssldap-parser.tab.h
 
 nssldap-parser.tab.c: nssldap-parser.y
-	${BISON} -o$@ -i -d nssldap-parser.y
+	${BISON} -o$@ -d nssldap-parser.y
 
 nssldap-parser.tab.h: nssldap-parser.tab.c
 

Modified: pcbsd/current/src-sh/pc-adctl/pc-nssldapconf/nssldap-lexer.l
===================================================================
--- pcbsd/current/src-sh/pc-adctl/nssldap/nssldap-lexer.l	2012-10-25 15:42:48 UTC (rev 19923)
+++ pcbsd/current/src-sh/pc-adctl/pc-nssldapconf/nssldap-lexer.l	2012-10-25 21:43:24 UTC (rev 19957)
@@ -10,8 +10,8 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "pc-nssldapconf.h"
 #include "nssldap-parser.tab.h"
-#include "nssldap-parser.tab.i"
 
 %}
 

Modified: pcbsd/current/src-sh/pc-adctl/pc-nssldapconf/nssldap-parser.y
===================================================================
--- pcbsd/current/src-sh/pc-adctl/nssldap/nssldap-parser.y	2012-10-25 15:42:48 UTC (rev 19923)
+++ pcbsd/current/src-sh/pc-adctl/pc-nssldapconf/nssldap-parser.y	2012-10-25 21:43:24 UTC (rev 19957)
@@ -4,7 +4,7 @@
  *	nss_ldap parser
  */
 
-#include "nssldapconf.h"
+#include "pc-nssldapconf.h"
 
 extern	int yylex(void);
 extern	int yyparse();

Modified: pcbsd/current/src-sh/pc-adctl/pc-pamconf/Makefile
===================================================================
--- pcbsd/current/src-sh/pc-adctl/pam/Makefile	2012-10-25 15:42:48 UTC (rev 19923)
+++ pcbsd/current/src-sh/pc-adctl/pc-pamconf/Makefile	2012-10-25 21:43:24 UTC (rev 19957)
@@ -11,7 +11,7 @@
 DESTDIR=	/usr/local/bin
 
 PROG=	pc-pamconf
-SRCS=	pamconf.c pamconf.h
+SRCS=	pc-pamconf.c pc-pamconf.h
 
 CFLAGS+= -I. -I${.CURDIR}
 
@@ -38,7 +38,7 @@
 pam-parser.tab.o: pam-lexer.lex.c pam-parser.tab.h
 
 pam-parser.tab.c: pam-parser.y
-	${BISON} -o$@ -i -d pam-parser.y
+	${BISON} -o$@ -d pam-parser.y
 
 pam-parser.tab.h: pam-parser.tab.c
 

Modified: pcbsd/current/src-sh/pc-adctl/pc-pamconf/pam-lexer.l
===================================================================
--- pcbsd/current/src-sh/pc-adctl/pam/pam-lexer.l	2012-10-25 15:42:48 UTC (rev 19923)
+++ pcbsd/current/src-sh/pc-adctl/pc-pamconf/pam-lexer.l	2012-10-25 21:43:24 UTC (rev 19957)
@@ -9,8 +9,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "pc-pamconf.h"
 #include "pam-parser.tab.h"
-#include "pam-parser.tab.i"
 
 %}
 

Modified: pcbsd/current/src-sh/pc-adctl/pc-pamconf/pam-parser.y
===================================================================
--- pcbsd/current/src-sh/pc-adctl/pam/pam-parser.y	2012-10-25 15:42:48 UTC (rev 19923)
+++ pcbsd/current/src-sh/pc-adctl/pc-pamconf/pam-parser.y	2012-10-25 21:43:24 UTC (rev 19957)
@@ -4,7 +4,7 @@
  *	pam parser
  */
 
-#include "pamconf.h"
+#include "pc-pamconf.h"
 
 extern	int yylex(void);
 extern	int yyparse();

Modified: pcbsd/current/src-sh/pc-adctl/pc-sambaconf/Makefile
===================================================================
--- pcbsd/current/src-sh/pc-adctl/samba/Makefile	2012-10-25 15:42:48 UTC (rev 19923)
+++ pcbsd/current/src-sh/pc-adctl/pc-sambaconf/Makefile	2012-10-25 21:43:24 UTC (rev 19957)
@@ -11,7 +11,7 @@
 DESTDIR=	/usr/local/bin
 
 PROG=	pc-sambaconf
-SRCS=	sambaconf.c sambaconf.h
+SRCS=	pc-sambaconf.c pc-sambaconf.h
 
 CFLAGS+= -I. -I${.CURDIR}
 
@@ -38,7 +38,7 @@
 samba-parser.tab.o: samba-lexer.lex.c samba-parser.tab.h
 
 samba-parser.tab.c: samba-parser.y
-	${BISON} -o$@ -i -d samba-parser.y
+	${BISON} -o$@ -d samba-parser.y
 
 samba-parser.tab.h: samba-parser.tab.c
 

Modified: pcbsd/current/src-sh/pc-adctl/pc-sambaconf/samba-lexer.l
===================================================================
--- pcbsd/current/src-sh/pc-adctl/samba/samba-lexer.l	2012-10-25 15:42:48 UTC (rev 19923)
+++ pcbsd/current/src-sh/pc-adctl/pc-sambaconf/samba-lexer.l	2012-10-25 21:43:24 UTC (rev 19957)
@@ -10,8 +10,8 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "pc-sambaconf.h"
 #include "samba-parser.tab.h"
-#include "samba-parser.tab.i"
 
 static	char *clean(char *str);
 

Modified: pcbsd/current/src-sh/pc-adctl/pc-sambaconf/samba-parser.y
===================================================================
--- pcbsd/current/src-sh/pc-adctl/samba/samba-parser.y	2012-10-25 15:42:48 UTC (rev 19923)
+++ pcbsd/current/src-sh/pc-adctl/pc-sambaconf/samba-parser.y	2012-10-25 21:43:24 UTC (rev 19957)
@@ -4,7 +4,7 @@
  *	samba parser
  */
 
-#include "sambaconf.h"
+#include "pc-sambaconf.h"
 
 extern	int yylex(void);
 extern	int yyparse();



More information about the Commits mailing list