[openbnc-cvs] openbnc/tools autoconf.c,1.3,1.4 convconf.c,1.3,1.4 makesalt.c,1.3,1.4
Status: Beta
Brought to you by:
andrereis
From: Nuno A. <nun...@us...> - 2004-06-09 08:54:00
|
Update of /cvsroot/openbnc/openbnc/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31422/openbnc/tools Modified Files: autoconf.c convconf.c makesalt.c Log Message: Index: makesalt.c =================================================================== RCS file: /cvsroot/openbnc/openbnc/tools/makesalt.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- makesalt.c 4 Jun 2004 16:25:48 -0000 1.3 +++ makesalt.c 9 Jun 2004 08:53:50 -0000 1.4 @@ -124,7 +124,7 @@ fprintf(salt,"\n"); fclose(salt); printf("Salt File created. Move the Salt File to a safe location after\n"); - printf("psyBNC was compiled and delete it on your shell. You will need\n"); + printf("OpenBNC was compiled and delete it on your shell. You will need\n"); printf("the File later for update Compiling.\n"); exit (0x0); } Index: autoconf.c =================================================================== RCS file: /cvsroot/openbnc/openbnc/tools/autoconf.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- autoconf.c 4 Jun 2004 16:25:48 -0000 1.3 +++ autoconf.c 9 Jun 2004 08:53:50 -0000 1.4 @@ -434,7 +434,7 @@ } else printf("No openssl found. Get openssl at www.openssl.org\n"); - config=fopen("/psybnc/config.h","r"); + config=fopen("/openbnc/config.h","r"); if(config!=NULL) { fclose(config); @@ -464,19 +464,19 @@ #endif else fprintf(makefile,"INCLUDE = -I./src/ -I.\n"); - fprintf(makefile,"OBJS = src/psybnc.o src/match.o src/p_client.o src/p_crypt.o src/p_dcc.o src/p_hash.o src/p_idea.o src/p_inifunc.o src/p_link.o src/p_log.o src/p_memory.o src/p_network.o src/p_parse.o src/p_peer.o src/p_server.o src/p_socket.o src/p_string.o src/p_sysmsg.o src/p_userfile.o src/p_uchannel.o src/p_script.o src/p_topology.o src/p_intnet.o src/p_blowfish.o src/p_translate.o src/p_coredns.o src/snprintf.o %s\n",env); + fprintf(makefile,"OBJS = src/openbnc.o src/match.o src/p_client.o src/p_crypt.o src/p_dcc.o src/p_hash.o src/p_idea.o src/p_inifunc.o src/p_link.o src/p_log.o src/p_memory.o src/p_network.o src/p_parse.o src/p_peer.o src/p_server.o src/p_socket.o src/p_string.o src/p_sysmsg.o src/p_userfile.o src/p_uchannel.o src/p_script.o src/p_topology.o src/p_intnet.o src/p_blowfish.o src/p_translate.o src/p_coredns.o src/snprintf.o %s\n",env); if(provi==0) fprintf(makefile,"DEFINE = -DHAVE_CONFIG %s%s%s%s%s%s\n",sunosopt,bigopt,ipv6opt,timeopt,sslopt,dnsopt); else fprintf(makefile,"DEFINE = -DHAVE_PROV_CONFIG %s%s%s%s%s%s\n",sunosopt,bigopt,ipv6opt,timeopt,sslopt,dnsopt); - fprintf(makefile,"TARGET = psybnc\n"); + fprintf(makefile,"TARGET = openbnc\n"); fprintf(makefile,"\n"); fprintf(makefile,"all: $(OBJS)\n"); fprintf(makefile," $(CC) -o $(TARGET) $(CFLAGS) $(OBJS) $(LIBS)\n"); fprintf(makefile," @strip $(TARGET)\n"); if(ssl==0) { - if(!fexists("key/psybnc.cert.pem")) /* only create, if not exist */ + if(!fexists("key/openbnc.cert.pem")) /* only create, if not exist */ { mkdir("key",0700); fprintf(makefile," @echo \"*** GENERATING SSL-KEYS FROM CERTIFICATE **\"\n"); @@ -486,14 +486,14 @@ fprintf(makefile," @echo \"* for the sake of correct Cert-Checking *\"\n"); fprintf(makefile," @echo \"*******************************************\"\n"); fprintf(makefile," @echo \"Generating certificate request .. \"\n"); - fprintf(makefile," @%s req -new -config src/ssl.cnf -out key/psybnc.req.pem \\\n",sslbin); - fprintf(makefile," -keyout key/psybnc.key.pem -nodes\n"); + fprintf(makefile," @%s req -new -config src/ssl.cnf -out key/openbnc.req.pem \\\n",sslbin); + fprintf(makefile," -keyout key/openbnc.key.pem -nodes\n"); fprintf(makefile," @echo \"Generating self-signed certificate .. \"\n"); - fprintf(makefile," @%s req -x509 -days 365 -in key/psybnc.req.pem \\\n",sslbin); - fprintf(makefile," -key key/psybnc.key.pem -out key/psybnc.cert.pem\n"); + fprintf(makefile," @%s req -x509 -days 365 -in key/openbnc.req.pem \\\n",sslbin); + fprintf(makefile," -key key/psybnc.key.pem -out key/openbnc.cert.pem\n"); fprintf(makefile," @echo \"Generating fingerprint ..\"\n"); fprintf(makefile," @%s x509 -subject -dates -fingerprint -noout \\\n",sslbin); - fprintf(makefile," -in key/psybnc.cert.pem\n"); + fprintf(makefile," -in key/openbnc.cert.pem\n"); } if(!fexists("src/ssl.rnd")) { @@ -527,7 +527,7 @@ } } } - fprintf(makefile," @echo " APPNAME APPVER "-%s ready. Please read the README before you run psybnc.\n",os); + fprintf(makefile," @echo " APPNAME APPVER "-%s ready. Please read the README before you run openbnc.\n",os); fprintf(makefile,"\n"); fprintf(makefile,"include ./targets.mak\n"); fclose(makefile); Index: convconf.c =================================================================== RCS file: /cvsroot/openbnc/openbnc/tools/convconf.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- convconf.c 4 Jun 2004 16:25:48 -0000 1.3 +++ convconf.c 9 Jun 2004 08:53:50 -0000 1.4 @@ -173,11 +173,11 @@ system("mv *.MOTD motd 2>/dev/null"); system("mv *.MOTD.old motd 2>/dev/null"); system("rm -rf *.INI.old 2>/dev/null"); - handle=fopen("psbnc.ini","r"); + handle=fopen("pnbnc.ini","r"); if(handle!=NULL) { fclose(handle); - printf("psyBNC2.1 -> psyBNC2.2 Conversion Utility\nChecking old Ini-Files\n"); + printf("psyBNC2.1 -> OpenBNC 1.0 Conversion Utility\nChecking old Ini-Files\n"); fconfif=fopen("psybnc.conf","a"); if(fconfif==NULL) { |