← Back to branch summary

~ubuntu-branches/ubuntu/natty/freeradius/natty-updates

« back to all changes in this revision

Viewing changes to src/modules/rlm_preprocess/rlm_preprocess.c

  • Committer: Bazaar Package Importer
  • Author(s): Josip Rodin
  • Date: 2009-11-23 03:57:37 UTC
  • mfrom: (1.2.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 28.
  • Revision ID: james.westby@ubuntu.com-20091123035737-zsgtzhfych8hir68
Tags: 2.1.7+dfsg-1
http://bugs.debian.org/536623
http://bugs.debian.org/513484
http://bugs.debian.org/526175
http://bugs.debian.org/533396
http://bugs.debian.org/550143
* Adopting the package, closes: #536623.
* New upstream version, closes: #513484.
  + Fixes the blooper in unlang evaluation logic, closes: #526175.
* Used quilt (and added README.source), and moved upstream file patching
  into debian/patches/. The source is no longer in collab-maint git
  (to make it simpler for me to finally get this out the door), but
  kept the .gitignore should we need that again.
* Dropped the dialup_admin/bin/backup_radacct patch (integrated upstream).
* Dropped the raddb/Makefile patch (problem no longer exists upstream).
* Dropped the lib/packet.c lib/radius.c main/listen.c patches (was from
  upstream 2.0.5 anyway).
* Dropped references to otp.conf, it no longer exists upstream.
  Keep removing the conffile statoverride in prerm.
* Dropped references to snmp.conf, it no longer exists upstream.
  Keep removing the conffile statoverride in prerm.
* Ship /etc/freeradius/modules/* in the freeradius package.
* Stop shipping sites-enabled symlinks in the package and instead create
  them only on initial install, thanks to Matej Vela, closes: #533396.
* Add export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" to the init script
  at the request of John Morrissey, closes: #550143.
* Stop installing /var/run/freeradius in the package to silence Lintian.
  The init script already recreates it at will.
* Remove executable bit from example.pl to silence Lintian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/rlm_preprocess/rlm_preprocess.c
3
3
 *              Contains the functions for the "huntgroups" and "hints"
4
4
 *              files.
5
5
 *
6
 
 * Version:     $Id: rlm_preprocess.c,v 1.83 2008/03/05 10:13:21 aland Exp $
 
6
 * Version:     $Id$
7
7
 *
8
8
 *   This program is free software; you can redistribute it and/or modify
9
9
 *   it under the terms of the GNU General Public License as published by
24
24
 */
25
25
 
26
26
#include        <freeradius-devel/ident.h>
27
 
RCSID("$Id: rlm_preprocess.c,v 1.83 2008/03/05 10:13:21 aland Exp $")
 
27
RCSID("$Id$")
28
28
 
29
29
#include        <freeradius-devel/radiusd.h>
30
30
#include        <freeradius-devel/modules.h>
341
341
                if (((strcmp(i->name, "DEFAULT") == 0) ||
342
342
                     (strcmp(i->name, name) == 0)) &&
343
343
                    (paircompare(request, request_pairs, i->check, NULL) == 0)) {
344
 
                        DEBUG2("  hints: Matched %s at %d",
 
344
                        RDEBUG2("  hints: Matched %s at %d",
345
345
                               i->name, i->lineno);
346
346
                        /*
347
347
                         *      Now add all attributes to the request list,
580
580
        if ((r = huntgroup_access(request,
581
581
                                  data->huntgroups)) != RLM_MODULE_OK) {
582
582
                char buf[1024];
583
 
                radlog(L_AUTH, "No huntgroup access: [%s] (%s)",
 
583
                radlog_request(L_AUTH, 0, request, "No huntgroup access: [%s] (%s)",
584
584
                       request->username ? request->username->vp_strvalue : "<NO User-Name>",
585
585
                       auth_name(buf, sizeof(buf), request, 1));
586
586
                return r;
626
626
                return RLM_MODULE_FAIL;
627
627
        }
628
628
 
629
 
        r = hints_setup(data->hints, request);
 
629
        hints_setup(data->hints, request);
630
630
 
631
631
        if ((r = huntgroup_access(request,
632
632
                                  data->huntgroups)) != RLM_MODULE_OK) {
633
633
                char buf[1024];
634
 
                radlog(L_INFO, "No huntgroup access: [%s] (%s)",
 
634
                radlog_request(L_INFO, 0, request, "No huntgroup access: [%s] (%s)",
635
635
                       request->username ? request->username->vp_strvalue : "<NO User-Name>",
636
636
                       auth_name(buf, sizeof(buf), request, 1));
637
637
                return r;