Просмотр исходного кода

Adds Heimdal GSSAPI to build system, adds extended security to session flag

Julien 'Lta' BALLET 11 лет назад
Родитель
Сommit
6f501eb3b0
3 измененных файлов с 7 добавлено и 4 удалено
  1. 2 2
      Makefile.am
  2. 3 0
      configure.ac
  3. 2 2
      src/smb_message.c

+ 2 - 2
Makefile.am

@@ -4,7 +4,7 @@ DISTCLEANFILES = @DOLT_CLEANFILES@
 
 EXTRA_DIST =
 
-CFLAGS = -I$(top_srcdir)/contrib -I$(top_srcdir)/include
+CFLAGS = -I$(top_srcdir)/contrib -I$(top_srcdir)/include @H5L_GSS_CFLAGS@
 
 if DEBUG
 AM_CFLAGS = -O0 -g3 -Wall #-Wextra
@@ -64,7 +64,7 @@ libdsm_la_SOURCES = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libdsm.pc
 
-libdsm_la_LDFLAGS = -version-info @BDSM_LIBTOOL_VERSION@ LTLIBICONV
+libdsm_la_LDFLAGS = -version-info @BDSM_LIBTOOL_VERSION@ LTLIBICONV @H5L_GSS_LIBS@
 
 
 bin_PROGRAMS =

+ 3 - 0
configure.ac

@@ -48,6 +48,9 @@ DOLT
 
 AC_CONFIG_MACRO_DIR([m4])
 
+## Checks for Heimdal
+PKG_CHECK_MODULES([H5L_GSS], [heimdal-gssapi > 1.5])
+
 ## Checks for doxygen presence
 AC_CHECK_PROGS([DOXYGEN], [doxygen])
 AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])

+ 2 - 2
src/smb_message.c

@@ -185,8 +185,8 @@ void            smb_message_set_default_flags(smb_message *msg)
   assert(msg != NULL && msg->packet != NULL);
 
   msg->packet->header.flags   = 0x18;
-  //msg->packet->header.flags2  = 0xc843; // w/ extended security;
-  msg->packet->header.flags2  = 0xc043; // w/o extended security;
+  msg->packet->header.flags2  = 0xc843; // w/ extended security;
+  //msg->packet->header.flags2  = 0xc043; // w/o extended security;
 }
 
 void            smb_message_set_andx_members(smb_message *msg)