lagertonne/nut
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Imported Upstream version 2.6.5

Browse source
This commit is contained in:
Laurent Bigonville 2012-08-12 23:39:31 +02:00
parent fefe62b2bd
commit a1fa151fc7
201 changed files with 7974 additions and 709 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/Makefile.am
View file

@ -21,10 +21,10 @@ endif
sbin_PROGRAMS = upsd
EXTRA_PROGRAMS = sockdebug
upsd_SOURCES = upsd.c user.c conf.c ssl.c sstate.c desc.c \
upsd_SOURCES = upsd.c user.c conf.c netssl.c sstate.c desc.c \
netget.c netmisc.c netlist.c netuser.c netset.c netinstcmd.c \
conf.h nut_ctype.h desc.h netcmds.h neterr.h netget.h netinstcmd.h \
netlist.h netmisc.h netset.h netuser.h ssl.h sstate.h stype.h upsd.h \
netlist.h netmisc.h netset.h netuser.h netssl.h sstate.h stype.h upsd.h \
upstype.h user-data.h user.h
sockdebug_SOURCES = sockdebug.c

19
server/Makefile.in
View file

@ -86,9 +86,9 @@ sockdebug_DEPENDENCIES = ../common/libcommon.la \
../common/libparseconf.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3)
am_upsd_OBJECTS = upsd.$(OBJEXT) user.$(OBJEXT) conf.$(OBJEXT) \
ssl.$(OBJEXT) sstate.$(OBJEXT) desc.$(OBJEXT) netget.$(OBJEXT) \
netmisc.$(OBJEXT) netlist.$(OBJEXT) netuser.$(OBJEXT) \
netset.$(OBJEXT) netinstcmd.$(OBJEXT)
netssl.$(OBJEXT) sstate.$(OBJEXT) desc.$(OBJEXT) \
netget.$(OBJEXT) netmisc.$(OBJEXT) netlist.$(OBJEXT) \
netuser.$(OBJEXT) netset.$(OBJEXT) netinstcmd.$(OBJEXT)
upsd_OBJECTS = $(am_upsd_OBJECTS)
upsd_LDADD = $(LDADD)
upsd_DEPENDENCIES = ../common/libcommon.la ../common/libparseconf.la \
@ -128,6 +128,12 @@ CFLAGS = @CFLAGS@
CONFPATH = @CONFPATH@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
CPPUNIT_LIBS = @CPPUNIT_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DBLATEX = @DBLATEX@
DEFS = @DEFS@
@ -231,6 +237,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
@ -295,10 +302,10 @@ udevdir = @udevdir@
AM_CFLAGS = -I$(top_srcdir)/include $(am__append_1) $(am__append_2)
LDADD = ../common/libcommon.la ../common/libparseconf.la $(NETLIBS) \
$(am__append_3) $(am__append_4)
upsd_SOURCES = upsd.c user.c conf.c ssl.c sstate.c desc.c \
upsd_SOURCES = upsd.c user.c conf.c netssl.c sstate.c desc.c \
netget.c netmisc.c netlist.c netuser.c netset.c netinstcmd.c \
conf.h nut_ctype.h desc.h netcmds.h neterr.h netget.h netinstcmd.h \
netlist.h netmisc.h netset.h netuser.h ssl.h sstate.h stype.h upsd.h \
netlist.h netmisc.h netset.h netuser.h netssl.h sstate.h stype.h upsd.h \
upstype.h user-data.h user.h
sockdebug_SOURCES = sockdebug.c
@ -399,9 +406,9 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlist.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netmisc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netset.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netssl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netuser.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sockdebug.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sstate.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upsd.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user.Po@am__quote@

2
server/conf.c
View file

@ -22,7 +22,7 @@
#include "upsconf.h"
#include "sstate.h"
#include "user.h"
#include "ssl.h"
#include "netssl.h"
ups_t *upstable = NULL;
int num_ups = 0;

2
server/netcmds.h
View file

@ -19,7 +19,7 @@
#include "nut_ctype.h"
#include "ssl.h"
#include "netssl.h"
#include "netget.h"
#include "netset.h"
#include "netlist.h"

4
server/ssl.c → server/netssl.c
View file

@ -1,4 +1,4 @@
/* ssl.c - Interface to OpenSSL for upsd
/* netssl.c - Interface to OpenSSL for upsd
Copyright (C)
2002 Russell Kroll <rkroll@exploits.org>
@ -29,7 +29,7 @@
#include "upsd.h"
#include "neterr.h"
#include "ssl.h"
#include "netssl.h"
char *certfile = NULL;

2
server/ssl.h → server/netssl.h
View file

@ -1,4 +1,4 @@
/* ssl.h - ssl support prototypes for upsd
/* netssl.h - ssl support prototypes for upsd
Copyright (C) 2002 Russell Kroll <rkroll@exploits.org>

2
server/upsd.c
View file

@ -35,7 +35,7 @@
#include "user.h"
#include "nut_ctype.h"
#include "stype.h"
#include "ssl.h"
#include "netssl.h"
#include "sstate.h"
#include "desc.h"
#include "neterr.h"