fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 11:50:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2007-12-17 Dan Williams <dcbw@redhat.com>

Browse source 
Patch from Christian Persch <chpe@gnome.org>

	Fix up the build (gnome.org #473298)



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3180 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-12-18 04:29:57 +00:00
parent b1d28ff48b
commit 33f96a77ae
7 changed files with 21 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
vpn-daemons/pptp/ChangeLog
View file

@ -1,3 +1,9 @@
2007-12-17 Dan Williams <dcbw@redhat.com>
Patch from Christian Persch <chpe@gnome.org>
Fix up the build (gnome.org #473298)
2007-08-14 Dan Williams <dcbw@redhat.com>
* src/nm-openvpn-service.c

2
vpn-daemons/pptp/Makefile.am
View file

@ -1,5 +1,3 @@
AUTOMAKE_OPTIONS = foreign
if WITH_GNOME
SUBDIRS = src auth-dialog auth-dialog-general properties po
else

2
vpn-daemons/pptp/autogen.sh
View file

@ -3,7 +3,7 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
REQUIRED_AUTOMAKE_VERSION=1.7
REQUIRED_AUTOMAKE_VERSION=1.9
PKG_NAME=NetworkManager-pptp
(test -f $srcdir/configure.in \

15
vpn-daemons/pptp/configure.in
View file

@ -1,10 +1,10 @@
AC_PREREQ(2.52)
AC_PREREQ(2.59)
AC_INIT(NetworkManager-ppp_vpn, 0.7.0-beta, eemynotna@gmail.com, NetworkManager-ppp_vpn)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([subdir-objects])
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2 subdir-objects])
AC_CONFIG_HEADERS([config.h])
dnl
dnl Require programs
@ -72,9 +72,8 @@ if test "z$found_pppd_headers" = "z"; then
PPPD_CFLAGS="-I ./external/$PPPD_VERSION"
fi
PPPD_PLUGIN_DIR="$libexecdir/pppd/$PPPD_VERSION"
AC_SUBST([PPPD_VERSION])
AC_SUBST(PPPD_CFLAGS)
AC_SUBST(PPPD_PLUGIN_DIR)
dnl
dnl Checks for typedefs, structures, and compiler characteristics.
@ -187,7 +186,7 @@ else
AC_MSG_RESULT(no)
fi
AC_OUTPUT([
AC_CONFIG_FILES([
Makefile
src/Makefile
auth-dialog/Makefile
@ -195,3 +194,5 @@ auth-dialog-general/Makefile
properties/Makefile
po/Makefile.in
])
AC_OUTPUT

11
vpn-daemons/pptp/src/Makefile.am
View file

@ -23,8 +23,8 @@ AM_CPPFLAGS = \
bin_PROGRAMS = nm-ppp-starter
pppdplugindir = $(PPPD_PLUGIN_DIR)
pppdplugin_PROGRAMS = nm-pppd-plugin.so
pppdplugindir = $(libexecdir)/pppd/$(PPPD_VERSION)
pppdplugin_LTLIBRARIES = nm-pppd-plugin.la
nm_ppp_starter_SOURCES = \
nm-ppp-starter.c \
@ -49,15 +49,14 @@ nm_ppp_starter_LDADD = \
$(GTHREAD_LIBS) \
$(NETWORK_MANAGER_LIBS)
nm_pppd_plugin_so_SOURCES = \
nm_pppd_plugin_la_SOURCES = \
nm-pppd-plugin.c \
nm-pppd-plugin.h \
nm-ppp-starter.h
nm_pppd_plugin_so_LDFLAGS = \
-shared
nm_pppd_plugin_la_LDFLAGS = -module
nm_pppd_plugin_so_LDADD = \
nm_pppd_plugin_la_LIBADD = \
$(DBUS_LIBS) \
$(GTHREAD_LIBS)

3
vpn-daemons/pptp/src/nm-ppp-starter.c
View file

@ -45,6 +45,7 @@
#include <NetworkManager.h>
#include <NetworkManagerVPN.h>
#include <dbus-dict-helpers.h>
#include "nm-ppp-starter.h"
#include "nm-utils.h"
@ -1436,8 +1437,6 @@ static void nm_ppp_dbus_process_helper_ip4_config (DBusConnection *con, DBusMess
guint32 mtu;
guint32 mss;
gboolean success = FALSE;
char * empty = "";
int i;
DBusMessageIter iter, iter_dict;

37
vpn-daemons/pptp/src/nm-pppd-plugin.c
View file

@ -75,7 +75,6 @@ void send_config_error (DBusConnection *con, const char *item);
gboolean nm_get_auth_items (NmPPPData *data);
gboolean nm_store_auth_info (NmPPPData *data, char **auth_items, int num_auth_items);
gboolean nm_dbus_prepare_connection(NmPPPData *data);
static DBusHandlerResult nm_dbus_message_handler (DBusConnection *con, DBusMessage *message, void *user_data);
void nm_dbus_kill_connection(NmPPPData *data);
gboolean nm_dbus_prepare_connection(NmPPPData *data)
@ -133,42 +132,6 @@ void nm_dbus_kill_connection(NmPPPData *data)
if (data->password!=NULL) g_free(data->password);
}
/*
* nm_dbus_message_handler
*
* Handle requests for our services.
*
*/
static DBusHandlerResult nm_dbus_message_handler (DBusConnection *con, DBusMessage *message, void *user_data)
{
NmPPPData *data = (NmPPPData *)user_data;
const char *method;
const char *path;
DBusMessage *reply = NULL;
gboolean handled = TRUE;
g_return_val_if_fail (data != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
g_return_val_if_fail (con != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
g_return_val_if_fail (message != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
method = dbus_message_get_member (message);
path = dbus_message_get_path (message);
nm_info ("nm_dbus_message_handler() got method '%s' for path '%s'.", method, path);
handled = FALSE;
// reply:
if (reply)
{
dbus_connection_send (con, reply, NULL);
dbus_message_unref (reply);
}
return (handled ? DBUS_HANDLER_RESULT_HANDLED : DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
}
int nm_chap_check_hook(void)
{
plugin_data.pppd_pid=getpid();