Merge branch 'master' into wip/win32-port2

diff --cc kadmin/kadm_conn.c
Simple merge

diff --cc kdc/connect.c
index 58126ecefde21a87982cae3cb293f46caebe543d,318179b380b85211516b2ca528b02ac69ba5b9ca..af78fd02baa1f1487378234128a06698c8e86aec
--- 1/kdc/connect.c
--- 2/kdc/connect.c
+++ b/kdc/connect.c
@@@ -877,9 -877,9 +877,10 @@@ loop(krb5_context context
                    clear_descr(&d[i]);
                    continue;
                }
 +#ifndef NO_LIMIT_FD_SETSIZE
                if(max_fd < d[i].s)
                    max_fd = d[i].s;
+ #ifdef FD_SETSIZE
                if (max_fd >= FD_SETSIZE)
                    krb5_errx(context, 1, "fd too large");
  #endif

diff --cc kdc/hpropd.c
Simple merge

diff --cc lib/krb5/config_file.c
index 6329178385dd23c53ba94562371c20ea147c4a02,821578dc96ac4f43a6492dd53b607b9d730c0afa..c185195c27fe6c08c6225c4bb4758828230f0729
--- 1/lib/krb5/config_file.c
--- 2/lib/krb5/config_file.c
+++ b/lib/krb5/config_file.c
@@@ -473,6 -463,6 +473,21 @@@ krb5_config_parse_file_multi (krb5_cont
        return ENOENT;
  #endif
      } else {
++#ifdef KRB5_USE_PATH_TOKENS
++      char * exp_fname = NULL;
++
++      ret = _krb5_expand_path_tokens(context, fname, &exp_fname);
++      if (ret) {
++          if (newfname)
++              free(newfname);
++          return ret;
++      }
++      
++      if (newfname)
++          free(newfname);
++      fname = newfname = exp_fname;
++#endif
++
        f.f = fopen(fname, "r");
        f.s = NULL;
        if(f.f == NULL) {
@@@ -493,46 -483,9 +508,7 @@@
                free(newfname);
            return ret;
        }
- =======
- #ifdef KRB5_USE_PATH_TOKENS
-     {
-       char * exp_fname = NULL;
- 
-       ret = _krb5_expand_path_tokens(context, fname, &exp_fname);
-       if (ret) {
-           if (newfname)
-               free(newfname);
-           return ret;
-       }
- 
-       if (newfname)
-           free(newfname);
-       fname = newfname = exp_fname;
-     }
- #endif
- 
-     f.f = fopen(fname, "r");
-     f.s = NULL;
-     if(f.f == NULL) {
-       ret = errno;
-       krb5_set_error_message (context, ret, "open %s: %s",
-                               fname, strerror(ret));
-       if (newfname)
-           free(newfname);
-       return ret;
-     }
- 
-     ret = krb5_config_parse_debug (&f, res, &lineno, &str);
-     fclose(f.f);
-     if (ret) {
-       krb5_set_error_message (context, ret, "%s:%u: %s", fname, lineno, str);
-       if (newfname)
-           free(newfname);
-       return ret;
- >>>>>>> Initial Windows port
      }
--    if (newfname)
--      free(newfname);
      return 0;
  }
  

diff --cc lib/roken/roken.h.in
index f6d704066d3ce47ae6f23b1b29a48b2338f946af,edea16a8b443bf8ab187ec3095101e5bf9720bc9..8694db53f97939b9d6531fd091ac50cb4e53aa6b
--- 1/lib/roken/roken.h.in
--- 2/lib/roken/roken.h.in
+++ b/lib/roken/roken.h.in
@@@ -72,8 -72,8 +72,8 @@@ typedef SOCKET rk_socket_t
  #define EWOULDBLOCK             WSAEWOULDBLOCK
  #define ENOTSOCK              WSAENOTSOCK
  
--#define rk_SOCK_INIT rk_WSAStartup()
--#define rk_SOCK_EXIT rk_WSACleanup()
++#define rk_SOCK_INIT() rk_WSAStartup()
++#define rk_SOCK_EXIT() rk_WSACleanup()
  
  ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL rk_WSAStartup(void);
  ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL rk_WSACleanup(void);