[Heimdal-source-changes] [heimdal/heimdal] a0860e: Revert "Minor WIN32/POSIX bug in resolve_origin()"

[GitHub]

  Branch: refs/heads/heimdal-1-6-branch
  Home:   https://github.com/heimdal/heimdal
  Commit: a0860eef32adbe4bae33703209e68944a6c18951
      https://github.com/heimdal/heimdal/commit/a0860eef32adbe4bae33703209e68944a6c18951
  Author: Jeffrey Altman <jaltman at secure-endpoints.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M lib/krb5/plugin.c

  Log Message:
  -----------
  Revert "Minor WIN32/POSIX bug in resolve_origin()"

This reverts commit 44ce8640baec94023441f7cbf9441df433353969.


  Commit: f9f0c7d118aa720e5059df47da216e716697124d
      https://github.com/heimdal/heimdal/commit/f9f0c7d118aa720e5059df47da216e716697124d
  Author: Nicolas Williams <nico at cryptonector.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M lib/roken/dlfcn_w32.c

  Log Message:
  -----------
  dladdr() on Win32 should't leave dli_fname == NULL

(cherry picked from commit 2fd4c5833831bf35091f22d388cbea02c552308f)


  Commit: 340489e5d07dc980b3fae2e7dd52f570fb5367b6
      https://github.com/heimdal/heimdal/commit/340489e5d07dc980b3fae2e7dd52f570fb5367b6
  Author: Nicolas Williams <nico at cryptonector.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M lib/roken/dlfcn_w32.c

  Log Message:
  -----------
  Win32 dladdr() wasn't returning 0 in all failures

(cherry picked from commit fdabfd60402ba2e50905d981f89561bced60a9a6)


  Commit: 5806cbf864a1ea40b0c8b3eb958051c326cdae8b
      https://github.com/heimdal/heimdal/commit/5806cbf864a1ea40b0c8b3eb958051c326cdae8b
  Author: Jeffrey Altman <jaltman at secure-endpoints.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M appl/gssmask/gssmaestro.c
    M appl/gssmask/gssmask.c
    M kadmin/rpc.c
    M lib/kadm5/private.h
    M lib/kadm5/send_recv.c
    M lib/krb5/Makefile.am
    M lib/krb5/NTMakefile
    M lib/krb5/libkrb5-exports.def.in
    M lib/krb5/store_emem.c
    M lib/krb5/store_fd.c
    M lib/krb5/store_mem.c
    A lib/krb5/store_sock.c
    M lib/krb5/version-script.map

  Log Message:
  -----------
  Introduce and apply krb5_storage_from_socket

On Windows a file descriptor is an int value allocated by the
local module instance of the C Run Time Library.  A socket handle is a
SOCKET value allocated by a Winsock Provider for the requested family and
protocol.   These two values cannot be mixed and there is no mechanism for
converting between the two.   The _get_osfhandle() and _open_osfhandle()
functions can work with a standard HANDLE (file, pipe, etc) but cannot be
used for a SOCKET.

The Heimdal krb5_storage_from_fd() routine counted on the osf conversion
functions working on SOCKET values.  Since they do not any attempt to call
krb5_storage_from_fd() on a socket resulted in an assertion being thrown
by the C RTL.

Another problem is SOCKET value truncation when storing a 64-bit value
into a 32-bit int.

To address these problems a new krb5_storage_from_socket() routine is
introduced.  This routine setups a krb5_storage that stores a socket value
as a rk_socket_t and provides a set of helper routines that always use
network ready functions.

The krb5_storage_from_fd() routines no longer use net_read() and
net_write() but provide helpers that follow their logic so that pipes can
be processed.

All call sites that allocate a socket now store the socket as rk_socket_t
and call krb5_storage_from_socket().

All locations that previously called the bare close() on a socket value
now call rk_closesocket().

Change-Id: I045f775b2a5dbf5cf803751409490bc27fffe597
(cherry picked from commit dba026b5ef703d625abd7c5d2471bb474f6b8128)


  Commit: 42c637322ce4f4ef968d84667d4aec3964379cdf
      https://github.com/heimdal/heimdal/commit/42c637322ce4f4ef968d84667d4aec3964379cdf
  Author: Jeffrey Altman <jaltman at secure-endpoints.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M include/bits.c

  Log Message:
  -----------
  define HEIMDAL_WARN_UNUSED_RESULT_ATTRIBUTE

Always define HEIMDAL_WARN_UNUSED_RESULT_ATTRIBUTE even if attributes are
not supported.

Change-Id: Ibc2110d809d81f546723853038c69176075d6013
(cherry picked from commit d9bc25619969be8938c828dcbed79d1c83ee08dc)


  Commit: c159dfad070d21111a8b32b4d2321527d509c442
      https://github.com/heimdal/heimdal/commit/c159dfad070d21111a8b32b4d2321527d509c442
  Author: Jeffrey Altman <jaltman at secure-endpoints.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M lib/krb5/plugin.c

  Log Message:
  -----------
  improve resolve_origin readability

comment the HAVE_DLADDR preprocessor #else and #endif
because they are so many lines apart.

indent the strrchr() call after the _Win32 block to demonstrate
they are related.

Change-Id: I112dc91b350b277cdb1dc1cd3ccd8f31a2084409
(cherry picked from commit 8de592ab5a39c48381c1cd5d4b32f6f2b7e6864b)


  Commit: 7cefa687acec1852744743731c70415e8bcf8dc8
      https://github.com/heimdal/heimdal/commit/7cefa687acec1852744743731c70415e8bcf8dc8
  Author: Jeffrey Altman <jaltman at secure-endpoints.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M packages/windows/installer/heimdal-command.wxs
    M packages/windows/installer/heimdal-installer.wxs

  Log Message:
  -----------
  Windows packaging: install kadmin.exe

Now that kadmin.exe works on Windows, install it.

Change-Id: I4b5e85386bd6e39ac1a8e01cd6d323c09520da1a
(cherry picked from commit e52c5f2a6469921056e39e69a7f88691bd290121)


Compare: https://github.com/heimdal/heimdal/compare/73777a6141d0...7cefa687acec