Index: libroar/Makefile
===================================================================
--- libroar/Makefile	(revision 5031)
+++ libroar/Makefile	(revision 5109)
@@ -14,4 +14,5 @@
 
 #DEFINES        = -DDEBUG
+DEFINES+= -D_LIBROAR_NOATTR_WARNINGS
 INCLUDE = -I../include -I../include/libroar
 CFLAGS += -g -Wall $(OPTI_O) $(DEFINES) $(INCLUDE) $(INCPATH) $(SHARED_CF) $(fPIC)
Index: libroar/basic.c
===================================================================
--- libroar/basic.c	(revision 4945)
+++ libroar/basic.c	(revision 5109)
@@ -157,12 +157,12 @@
     ) {
   if ( (server = roar_slp_find_roard(0)) != NULL ) {
-   if ( (fh = roar_connect_raw(server)) != -1 )
+   if ( (fh = roar_connect_raw2(server, 0, 0)) != -1 )
     return fh;
 
    /* in case we can not connect to the server given this may be a cache problem,
       we do a new lookup with the cache disabled in this case                     */
-   ROAR_WARN("roar_connect_raw(*): Can not connect to SLP located server, disabling cache");
+   ROAR_WARN("roar_connect_raw2(*): Can not connect to SLP located server, disabling cache");
    if ( (server = roar_slp_find_roard(1)) != NULL )
-    if ( (fh = roar_connect_raw(server)) != -1 )
+    if ( (fh = roar_connect_raw2(server, 0, 0)) != -1 )
      return fh;
   }
@@ -175,5 +175,5 @@
  if ( list != NULL ) {
   for (i = 0; list[i].server != NULL; i++) {
-   if ( (fh = roar_connect_raw((char*)list[i].server)) != -1 ) {
+   if ( (fh = roar_connect_raw2((char*)list[i].server, 0, 0)) != -1 ) {
     roar_enum_servers_free(list);
     return fh;
@@ -218,5 +218,5 @@
     strncat(user_sock, ROAR_DEFAULT_OBJECT, DN_MAXOBJL+2);
 #else
-    ROAR_ERR("roar_connect_raw(*): size of DECnet object unknown.");
+    ROAR_ERR("roar_connect_raw2(*): size of DECnet object unknown.");
 #endif
    }
@@ -235,5 +235,5 @@
   roar_err_set(ROAR_ERROR_CONNREFUSED);
 
- ROAR_DBG("roar_connect_raw(*) = %i", fh);
+ ROAR_DBG("roar_connect_raw2(*) = %i", fh);
 
  return fh;
Index: libroar/debug.c
===================================================================
--- libroar/debug.c	(revision 4936)
+++ libroar/debug.c	(revision 5109)
@@ -67,4 +67,15 @@
    ROAR_WARN("%s(*): This function is obsolete. Please use %s(...). %s", func, newfunc, info == NULL ? "" : info);
   }
+ }
+}
+
+void roar_debug_bin_obsolete(const char * progname, const char * newprog, const char * info) {
+ if ( info == NULL )
+  info = "";
+
+ if ( newprog == NULL ) {
+  roar_debug_msg(ROAR_DEBUG_TYPE_ERROR, 0, progname, ROAR_DBG_PREFIX, "This program is obsolete and will be removed soon. %s", info);
+ } else {
+  roar_debug_msg(ROAR_DEBUG_TYPE_ERROR, 0, progname, ROAR_DBG_PREFIX, "This program is obsolete and will be removed soon. Please use %s. %s", newprog, info);
  }
 }
Index: libroar/enumdev.c
===================================================================
--- libroar/enumdev.c	(revision 5027)
+++ libroar/enumdev.c	(revision 5109)
@@ -51,5 +51,5 @@
  ROAR_DBG("_test_server(c=%p{.server='%s', ...}, flags=0x%.4X) = ?", c, c->server, flags);
 
- if ( roar_connect(&con, (char*)c->server) == -1 )
+ if ( roar_connect2(&con, (char*)c->server, 0, 0) == -1 )
   return -1;
 
Index: libroar/socket.c
===================================================================
--- libroar/socket.c	(revision 5098)
+++ libroar/socket.c	(revision 5109)
@@ -34,4 +34,5 @@
  */
 
+#define _LIBROAR_NOATTR_TO_STATIC /* ignore warnings for TO_STATIC functions */
 #include "libroar.h"
 
Index: libroar/vio.c
===================================================================
--- libroar/vio.c	(revision 4973)
+++ libroar/vio.c	(revision 5109)
@@ -34,4 +34,5 @@
  */
 
+#define _LIBROAR_NOATTR_TO_STATIC /* ignore warnings for TO_STATIC functions */
 #include "libroar.h"
 
Index: libroar/vs.c
===================================================================
--- libroar/vs.c	(revision 5078)
+++ libroar/vs.c	(revision 5109)
@@ -854,5 +854,6 @@
  sockopt.optlen  = sizeof(val);
 
- roar_vio_ctl(&(vss->vio), ROAR_VIO_CTL_GET_SYSIO_SOCKOPT, &sockopt);
+ if ( roar_vio_ctl(&(vss->vio), ROAR_VIO_CTL_GET_SYSIO_SOCKOPT, &sockopt) == -1 )
+  return;
 
  val /= 2;
@@ -864,5 +865,6 @@
  sockopt.optlen  = sizeof(val);
 
- roar_vio_ctl(&(vss->vio), ROAR_VIO_CTL_SET_SYSIO_SOCKOPT, &sockopt);
+ if ( roar_vio_ctl(&(vss->vio), ROAR_VIO_CTL_SET_SYSIO_SOCKOPT, &sockopt) == -1 )
+  return;
 }
 #endif
