Win32 MS-VC++ build fixups.
git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/trunk@4283 06827809-a52a-0410-b366-d66718629ded
diff --git a/win32/libagent/libagent.def b/win32/libagent/libagent.def
index 6121fb4..203cfa2 100644
--- a/win32/libagent/libagent.def
+++ b/win32/libagent/libagent.def
@@ -12,4 +12,5 @@
argvrestart
argvrestartp
update_config
+ dump_idx_registry
diff --git a/win32/libagent/libagent.dsp b/win32/libagent/libagent.dsp
index f33b84e..042343a 100644
--- a/win32/libagent/libagent.dsp
+++ b/win32/libagent/libagent.dsp
@@ -86,6 +86,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\agent\agent_index.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\agent\agent_registry.c
# End Source File
# Begin Source File
diff --git a/win32/libsnmp_dll/libsnmp.def b/win32/libsnmp_dll/libsnmp.def
index 9405622..ffd5004 100644
--- a/win32/libsnmp_dll/libsnmp.def
+++ b/win32/libsnmp_dll/libsnmp.def
@@ -144,6 +144,8 @@
read_config_print_usage
read_config_with_type
read_config_store
+ read_config_read_octet_string
+ read_config_save_octet_string
free_config
skip_white
skip_not_white
@@ -224,14 +226,21 @@
copy_word
calculate_time_diff
vacm_createGroupEntry
+ vacm_destroyGroupEntry
vacm_destroyAllGroupEntries
vacm_createAccessEntry
+ vacm_destroyAccessEntry
vacm_destroyAllAccessEntries
vacm_createViewEntry
+ vacm_destroyViewEntry
vacm_destroyAllViewEntries
vacm_getViewEntry
vacm_getGroupEntry
vacm_getAccessEntry
+ vacm_parse_config_access
+ vacm_parse_config_group
+ vacm_parse_config_view
+ store_vacm
vacm_scanGroupInit
vacm_scanGroupNext
vacm_scanAccessInit
@@ -249,7 +258,9 @@
snmp_set_random_access
snmp_set_suffix_only
usm_store_users
- vacm_is_configured
+ snmp_store
+ atime_diff
+ atime_newMarker
Mib DATA
tree_head DATA
snmp_errno DATA
diff --git a/win32/snmpbulkget/snmpbulkget.dsp b/win32/snmpbulkget/snmpbulkget.dsp
index df8fe92..ce47bd9 100644
--- a/win32/snmpbulkget/snmpbulkget.dsp
+++ b/win32/snmpbulkget/snmpbulkget.dsp
@@ -87,16 +87,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\apps\snmp_parse_args.c
-
-!IF "$(CFG)" == "snmpbulkget - Win32 Release"
-
-!ELSEIF "$(CFG)" == "snmpbulkget - Win32 Debug"
-
-# ADD CPP /I "..\snmplib"
-
-!ENDIF
-
+SOURCE=..\..\snmplib\snmp_parse_args.c
# End Source File
# Begin Source File
diff --git a/win32/snmpbulkwalk/snmpbulkwalk.dsp b/win32/snmpbulkwalk/snmpbulkwalk.dsp
index cad826e..7200637 100644
--- a/win32/snmpbulkwalk/snmpbulkwalk.dsp
+++ b/win32/snmpbulkwalk/snmpbulkwalk.dsp
@@ -87,16 +87,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\apps\snmp_parse_args.c
-
-!IF "$(CFG)" == "snmpbulkwalk - Win32 Release"
-
-!ELSEIF "$(CFG)" == "snmpbulkwalk - Win32 Debug"
-
-# ADD CPP /I "..\snmplib"
-
-!ENDIF
-
+SOURCE=..\..\snmplib\snmp_parse_args.c
# End Source File
# Begin Source File
diff --git a/win32/snmpd/snmpd.dsp b/win32/snmpd/snmpd.dsp
index 0723958..4d8eb0e 100644
--- a/win32/snmpd/snmpd.dsp
+++ b/win32/snmpd/snmpd.dsp
@@ -83,6 +83,14 @@
# Name "snmpd - Win32 Debug"
# Begin Source File
+SOURCE=..\..\snmplib\getopt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\snmplib\snmp_parse_args.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\agent\auto_nlist.c
# End Source File
# Begin Source File
diff --git a/win32/snmpdelta/snmpdelta.dsp b/win32/snmpdelta/snmpdelta.dsp
index 6a6cffe..64c1d8a 100644
--- a/win32/snmpdelta/snmpdelta.dsp
+++ b/win32/snmpdelta/snmpdelta.dsp
@@ -87,16 +87,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\apps\snmp_parse_args.c
-
-!IF "$(CFG)" == "snmpdelta - Win32 Release"
-
-!ELSEIF "$(CFG)" == "snmpdelta - Win32 Debug"
-
-# ADD CPP /I "..\snmplib"
-
-!ENDIF
-
+SOURCE=..\..\snmplib\snmp_parse_args.c
# End Source File
# Begin Source File
diff --git a/win32/snmpget/snmpget.dsp b/win32/snmpget/snmpget.dsp
index 04610ed..32557b9 100644
--- a/win32/snmpget/snmpget.dsp
+++ b/win32/snmpget/snmpget.dsp
@@ -87,16 +87,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\apps\snmp_parse_args.c
-
-!IF "$(CFG)" == "snmpget - Win32 Release"
-
-!ELSEIF "$(CFG)" == "snmpget - Win32 Debug"
-
-# ADD CPP /I "..\snmplib"
-
-!ENDIF
-
+SOURCE=..\..\snmplib\snmp_parse_args.c
# End Source File
# Begin Source File
diff --git a/win32/snmpgetnext/snmpgetnext.dsp b/win32/snmpgetnext/snmpgetnext.dsp
index dc9a33d..9feb969 100644
--- a/win32/snmpgetnext/snmpgetnext.dsp
+++ b/win32/snmpgetnext/snmpgetnext.dsp
@@ -87,16 +87,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\apps\snmp_parse_args.c
-
-!IF "$(CFG)" == "snmpgetnext - Win32 Release"
-
-!ELSEIF "$(CFG)" == "snmpgetnext - Win32 Debug"
-
-# ADD CPP /I "..\snmplib"
-
-!ENDIF
-
+SOURCE=..\..\snmplib\snmp_parse_args.c
# End Source File
# Begin Source File
diff --git a/win32/snmpset/snmpset.dsp b/win32/snmpset/snmpset.dsp
index 16eab45..6329365 100644
--- a/win32/snmpset/snmpset.dsp
+++ b/win32/snmpset/snmpset.dsp
@@ -87,7 +87,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\apps\snmp_parse_args.c
+SOURCE=..\..\snmplib\snmp_parse_args.c
# End Source File
# Begin Source File
diff --git a/win32/snmpstatus/snmpstatus.dsp b/win32/snmpstatus/snmpstatus.dsp
index 119dd59..0dc947b 100644
--- a/win32/snmpstatus/snmpstatus.dsp
+++ b/win32/snmpstatus/snmpstatus.dsp
@@ -87,16 +87,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\apps\snmp_parse_args.c
-
-!IF "$(CFG)" == "snmpstatus - Win32 Release"
-
-!ELSEIF "$(CFG)" == "snmpstatus - Win32 Debug"
-
-# ADD CPP /I "..\snmplib"
-
-!ENDIF
-
+SOURCE=..\..\snmplib\snmp_parse_args.c
# End Source File
# Begin Source File
diff --git a/win32/snmptable/snmptable.dsp b/win32/snmptable/snmptable.dsp
index bd860cc..a1d4262 100644
--- a/win32/snmptable/snmptable.dsp
+++ b/win32/snmptable/snmptable.dsp
@@ -88,7 +88,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\apps\snmp_parse_args.c
+SOURCE=..\..\snmplib\snmp_parse_args.c
# End Source File
# Begin Source File
diff --git a/win32/snmptest/snmptest.dsp b/win32/snmptest/snmptest.dsp
index d8e7f7e..0912209 100644
--- a/win32/snmptest/snmptest.dsp
+++ b/win32/snmptest/snmptest.dsp
@@ -87,16 +87,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\apps\snmp_parse_args.c
-
-!IF "$(CFG)" == "snmptest - Win32 Release"
-
-!ELSEIF "$(CFG)" == "snmptest - Win32 Debug"
-
-# ADD CPP /I "..\snmplib"
-
-!ENDIF
-
+SOURCE=..\..\snmplib\snmp_parse_args.c
# End Source File
# Begin Source File
diff --git a/win32/snmptrap/snmptrap.dsp b/win32/snmptrap/snmptrap.dsp
index a75c8a3..add388f 100644
--- a/win32/snmptrap/snmptrap.dsp
+++ b/win32/snmptrap/snmptrap.dsp
@@ -88,7 +88,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\apps\snmp_parse_args.c
+SOURCE=..\..\snmplib\snmp_parse_args.c
# End Source File
# Begin Source File
diff --git a/win32/snmptrapd/snmptrapd.dsp b/win32/snmptrapd/snmptrapd.dsp
index 8cbab7b..717b34d 100644
--- a/win32/snmptrapd/snmptrapd.dsp
+++ b/win32/snmptrapd/snmptrapd.dsp
@@ -94,5 +94,9 @@
SOURCE=..\..\apps\snmptrapd_handlers.c
# End Source File
+# Begin Source File
+
+SOURCE=..\..\apps\snmptrapd_log.c
+# End Source File
# End Target
# End Project
diff --git a/win32/snmpusm/snmpusm.dsp b/win32/snmpusm/snmpusm.dsp
index 3ff7e7a..dd55020 100644
--- a/win32/snmpusm/snmpusm.dsp
+++ b/win32/snmpusm/snmpusm.dsp
@@ -87,7 +87,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\apps\snmp_parse_args.c
+SOURCE=..\..\snmplib\snmp_parse_args.c
# End Source File
# Begin Source File
diff --git a/win32/snmpwalk/snmpwalk.dsp b/win32/snmpwalk/snmpwalk.dsp
index d90d8e7..74d963e 100644
--- a/win32/snmpwalk/snmpwalk.dsp
+++ b/win32/snmpwalk/snmpwalk.dsp
@@ -87,16 +87,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\apps\snmp_parse_args.c
-
-!IF "$(CFG)" == "snmpwalk - Win32 Release"
-
-!ELSEIF "$(CFG)" == "snmpwalk - Win32 Debug"
-
-# ADD CPP /I "..\snmplib"
-
-!ENDIF
-
+SOURCE=..\..\snmplib\snmp_parse_args.c
# End Source File
# Begin Source File
