Changeset 6645


Ignore:
Timestamp:
Aug 25, 2008, 8:32:26 PM (13 years ago)
Author:
charles
Message:

(shttpd) replace VERSION with SHTTPD_VERSION.
(shttpd) make shttpd_edit_passwords() a public function for now to fix the build.

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/libtransmission/rpc-server.c

    r6641 r6645  
    372372            unlink( passwd );
    373373        else
    374             edit_passwords( passwd, MY_REALM, server->username, server->password );
     374            shttpd_edit_passwords( passwd, MY_REALM, server->username, server->password );
    375375
    376376        argv[argc++] = tr_strdup( "appname-unused" );
  • trunk/third-party/shttpd/auth.c

    r6644 r6645  
    351351 */
    352352int
    353 _shttpd_edit_passwords(const char *fname, const char *domain,
     353shttpd_edit_passwords(const char *fname, const char *domain,
    354354                const char *user, const char *pass)
    355355{
  • trunk/third-party/shttpd/compat_win32.c

    r6644 r6645  
    534534        cls.lpfnWndProc = (WNDPROC) WindowProc;
    535535        cls.hIcon = LoadIcon(NULL, IDI_APPLICATION);
    536         cls.lpszClassName = "shttpd v." VERSION;
     536        cls.lpszClassName = "shttpd v." SHTTPD_VERSION;
    537537
    538538        if (!RegisterClass(&cls))
  • trunk/third-party/shttpd/config.h

    r6644 r6645  
    1212#define CONFIG_HEADER_DEFINED
    1313
    14 #define VERSION         "1.42"          /* Version                      */
     14#define SHTTPD_VERSION  "1.42"          /* Version                      */
    1515#define CONFIG_FILE     "shttpd.conf"   /* Configuration file           */
    1616#define HTPASSWD        ".htpasswd"     /* Passwords file name          */
     
    2525#define ENV_MAX         4096            /* Size of environment block    */
    2626#define CGI_ENV_VARS    64              /* Maximum vars passed to CGI   */
    27 #define SERVICE_NAME    "SHTTPD " VERSION       /* NT service name      */
     27#define SERVICE_NAME    "SHTTPD " SHTTPD_VERSION        /* NT service name      */
    2828
    2929#endif /* CONFIG_HEADER_DEFINED */
  • trunk/third-party/shttpd/defs.h

    r6644 r6645  
    381381extern int      _shttpd_is_authorized_for_put(struct conn *c);
    382382extern void     _shttpd_send_authorization_request(struct conn *c);
    383 extern int      _shttpd_edit_passwords(const char *fname, const char *domain,
     383extern int      shttpd_edit_passwords(const char *fname, const char *domain,
    384384                        const char *user, const char *pass);
    385385
  • trunk/third-party/shttpd/io_emb.c

    r6644 r6645  
    1414shttpd_version(void)
    1515{
    16         return (VERSION);
     16        return (SHTTPD_VERSION);
    1717}
    1818
  • trunk/third-party/shttpd/shttpd.c

    r6644 r6645  
    17611761        (void) fprintf(stderr,
    17621762            "SHTTPD version %s (c) Sergey Lyubka\n"
    1763             "usage: %s [options] [config_file]\n", VERSION, prog);
     1763            "usage: %s [options] [config_file]\n", SHTTPD_VERSION, prog);
    17641764
    17651765#if !defined(NO_AUTH)
  • trunk/third-party/shttpd/shttpd.h

    r6644 r6645  
    105105int  shttpd_socketpair(int sp[2]);
    106106
     107
     108extern int      shttpd_edit_passwords(const char *fname, const char *domain,
     109                        const char *user, const char *pass);
     110
     111
    107112#ifdef __cplusplus
    108113}
  • trunk/third-party/shttpd/standalone.c

    r6644 r6645  
    3737                if (argc != 6)
    3838                        _shttpd_usage(argv[0]);
    39                 exit(_shttpd_edit_passwords(argv[2],argv[3],argv[4],argv[5]));
     39                exit(shttpd_edit_passwords(argv[2],argv[3],argv[4],argv[5]));
    4040        }
    4141#endif /* NO_AUTH */
     
    6161
    6262        _shttpd_elog(E_LOG, NULL, "shttpd %s started on port(s) %s, serving %s",
    63             VERSION, ctx->options[OPT_PORTS], ctx->options[OPT_ROOT]);
     63            SHTTPD_VERSION, ctx->options[OPT_PORTS], ctx->options[OPT_ROOT]);
    6464
    6565        while (exit_flag == 0)
Note: See TracChangeset for help on using the changeset viewer.